Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / todo / custom_location_for_openlayers.mdwn

diff --git a/doc/todo/custom_location_for_openlayers.mdwn b/doc/todo/custom_location_for_openlayers.mdwn
index c387a4cf5ed71ff076c954df142e156ad92b2e7f..3ccfa294487d4e24c86aa911b815ec7b60ef72a9 100644 (file)
--- a/doc/todo/custom_location_for_openlayers.mdwn
+++ b/doc/todo/custom_location_for_openlayers.mdwn
@@ -10,3 +10,8 @@ For those reasons, I think the location of that script should be customizable. -
 There is now a [[patch]] for this, thanks to Genevieve, available in my master branch.
 
 Note that there's an update to the patch in my master branch, that allows changing the URL for tiles too.
 There is now a [[patch]] for this, thanks to Genevieve, available in my master branch.
 
 Note that there's an update to the patch in my master branch, that allows changing the URL for tiles too.

+
+> There's a lot of stuff in your master branch. Which commit is it,
+> or if you want me to merge it, spin a branch I can merge. --[[Joey]]
+
+> > I believe this was already fixed, actually - it's commit 409c4e48f983d10aceb6321148d7f440d17eb28f, which you cherry-picked on August 5th in d926c4a. So this is [[done]], thanks! -- [[anarcat]]