diff options
| author | Joey Hess <joey@kitenet.net> | 2008-09-05 14:01:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2008-09-05 14:01:12 -0400 |
| commit | dd349d69ea2361360b4534d9c77806345ff490ad (patch) | |
| tree | 5858da519b35151b5b04bc005550608d5b0bcb2c /debian/changelog | |
| parent | e79e3143509d3f4c0273e8eed5956d264cbc56e2 (diff) | |
| parent | 0f67e7d96953535e98d9ec26c30a25b8aaad782c (diff) | |
Merge branch 'master' of file:///srv/git/ikiwiki.info
Conflicts:
doc/todo/page_edit_disable.mdwn
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0b775761d..30014d13e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (2.63) UNRELEASED; urgency=low disable colons from being used in source files (which can cause trouble om Windows). * po/Makefile: update po files when the pot file has changed. Closes: #497951 + * editpage: New core plugin factoring out page editing to allow disabling it + if desired. -- Joey Hess <joeyh@debian.org> Thu, 28 Aug 2008 16:08:18 -0400 |