Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-06-14 16:54:42 -05:00
commit 193d932904
2 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,17 @@
* 0.17
New features:
* Ability to rename pages
* Ability to redirect Wikilinks, using
[[!redirect ...]]
* HTTP 302 redirects, for redirected/renamed pages
Bugs Fixed:
* Rails gets very unhappy with "." in page or author names.
Make sure that doesn't happen.
* Fix a Maruku escaping bug.
------------------------------------------------------------------------------
* 0.16.6 * 0.16.6
New Features: New Features:

View file

@ -257,8 +257,8 @@ end
module Instiki module Instiki
module VERSION #:nodoc: module VERSION #:nodoc:
MAJOR = 0 MAJOR = 0
MINOR = 16 MINOR = 17
TINY = 6 TINY = 0
SUFFIX = '(MML+)' SUFFIX = '(MML+)'
PRERELEASE = false PRERELEASE = false
if PRERELEASE if PRERELEASE