aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-21 17:27:50 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-21 17:27:50 -0400
commit18d24036477223794e8319428cd7ba971129c29c (patch)
tree23995024e878a6c0df4e1572571948af89d435e2 /debian
parent97e21ae21caa2418015ae512755e8078a0bc5ccf (diff)
parentc2ffd205f3301a9fe6b5949a88da770899642589 (diff)
downloadikiwiki-18d24036477223794e8319428cd7ba971129c29c.tar
ikiwiki-18d24036477223794e8319428cd7ba971129c29c.tar.gz
Merge branch 'master' into tova
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bcfb411b0..04d4fc662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ ikiwiki (2.55) UNRELEASED; urgency=low
* All rcs backends need to implement rcs_remove. (Done for svn, git).
* remove: New plugin that adds the ability to remove pages via the web.
(Sponsored by The TOVA Company.)
+ * tag: Allow tagbase to be overridden by starting a tag with "./" or "/".
+ (Simon McVittie)
+ * Really fix bug with links to pages with names containing colons.
+ Previous fix mised a few cases.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400