aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn2
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9a73f1084..da2cc73bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20120517) UNRELEASED; urgency=low
+
+ * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
+ other config differences by linking to the mirror's CGI. (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org> Sun, 03 Jun 2012 13:15:22 -0400
+
ikiwiki (3.20120516) unstable; urgency=high
* meta: Security fix; add missing sanitization of author and authorurl.
diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index ca9cb532c..5701d8e2b 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -99,3 +99,5 @@ and decided this time it was really needed to implement this feature.
>>>>>> this should not block the merge of the branch I have been
>>>>>> proposing. Support for the usecase you are suggesting can
>>>>>> always be added later if needed. --[[intrigeri]]
+
+>>>>>>> Well, that came out nice and clean. [[done]] --[[Joey]]