Added a comment: Use page.tmpl

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1db98647ed112f24880ab607d0ad5c0dfa1b77c7..cd5d62eed7d87bfdf5b0f13bee173bcabcfccb86 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20140126) UNRELEASED; urgency=medium
+ikiwiki (3.20140228) UNRELEASED; urgency=medium
+
+  * only_committed_changes could fail in a git repository merged
+    with git merge -s ours.
+  * Remove google from openid selector, per http://xkcd.com/1361/
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 05 Apr 2014 19:08:22 -0400
+
+ikiwiki (3.20140227) unstable; urgency=medium

 
   * Added useragent config setting. Closes: #737121
     Thanks, Tuomas Jormola
 
   * Added useragent config setting. Closes: #737121
     Thanks, Tuomas Jormola


@@ -26,7 +34,7 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
   * Special thanks to Simon McVittie for being the patchmeister for this
     release.
 
   * Special thanks to Simon McVittie for being the patchmeister for this
     release.
 

- -- Joey Hess <joeyh@debian.org>  Sat, 01 Feb 2014 16:53:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Feb 2014 11:55:35 -0400

 
 ikiwiki (3.20140125) unstable; urgency=medium
 
 
 ikiwiki (3.20140125) unstable; urgency=medium