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

2009-12-27 00:57:51 -06:00 · 2009-12-27 00:57:51 -06:00 · 7e61bc10d7
commit 7e61bc10d7
parent 27eab3ee41 2780344a1b
2 changed files with 31 additions and 2 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -265,8 +265,8 @@ end
 module Instiki
  module VERSION #:nodoc:
    MAJOR = 0
-    MINOR = 17
-    TINY  = 3 
+    MINOR = 18
+    TINY  = 0 
    SUFFIX = '(MML+)'
    PRERELEASE =  false
    if PRERELEASE