summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-08 19:31:06 -0400
committerJoey Hess <joey@kitenet.net>2010-10-08 19:31:06 -0400
commitf826251a6d506d6f8a31e30abfbe89338351bd6a (patch)
tree0c15b7609f6e4c1efd7b9929ff877ca4e5c400e9 /debian
parentc8214300ed6198d3a59cc1e3b3d74b0722c26b91 (diff)
parent2d99fe0d34be35d9e5d556d530f2d8993007cdf6 (diff)
Merge branch 'revert'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d12d0558..d1ee4967d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
* htmltidy: Allow configuring tidy parameters in setup file.
(W. Trevor King)
* Updated French program translation. Closes: #598918
+ * git: Added new rcs_revert and rcs_preprevert hooks.
+ * recentchanges: Add revert buttons to RecentChanges page, and
+ implement web-based reversion interface.
+ * Thanks to Peter Gammie for his assistance with the web-based reversion
+ feature.
-- Joey Hess <joeyh@debian.org> Wed, 29 Sep 2010 11:58:23 -0400