summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-09 14:44:52 -0400
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-09 14:44:52 -0400
commit5f44dd8e7762827753c02dcd78d663c0fd9554b3 (patch)
tree37d2604af5f95b714719ad68df44e31e9d23789d /debian/changelog
parent1332327f5e9fa394076b5a80b2678e9c2fa0bb48 (diff)
parent2a99ebf2766a08f8d68a82255d1518ecac73ec84 (diff)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6109a7012..de165e4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
* Add French basewiki translation from the Debian French l10n team,
including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+ * Expand banned_users; it can now include PageSpecs, which
+ allows banning by IP address.
+ * underlay: Also allow configuring additional directories to search
+ for template files in.
-- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400