aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2015-11-30 20:55:34 +0000
committerSimon McVittie <smcv@debian.org>2015-11-30 20:55:34 +0000
commitb199349ffddce2b8afd89567882e182f7ef9bff1 (patch)
tree41f7f91ddd28dd43a60b44e4715e97cd5806d68c /debian
parent67906ded049f5c52a541b1c7364829ea4ce7b58b (diff)
parentab768a62c66335a96a5791c444e54b8ae3b078b1 (diff)
downloadikiwiki-b199349ffddce2b8afd89567882e182f7ef9bff1.tar
ikiwiki-b199349ffddce2b8afd89567882e182f7ef9bff1.tar.gz
Merge remote-tracking branch 'smcv/ready/limit'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 30878bb0a..4be8489dc 100644
--- 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