Merge remote-tracking branch 'smcv/ready/limit'

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

diff --git a/debian/changelog b/debian/changelog
index 30878bb0a5883b8c6d519a3d74db6c5a9626131d..4be8489dc6318a2d44c4e2a8ff1f1c2de3135484 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
   * git: if no committer identity is known, set it to
     "IkiWiki <ikiwiki.info>" in .git/config. This resolves commit errors
     in versions of git that require a non-trivial committer identity.
+  * inline, trail: rename show, feedshow parameters to limit, feedlimit
+    (with backwards compatibility)
 
  -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100