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

2010-02-27 09:54:13 -06:00 · 2010-02-27 09:54:13 -06:00 · 57fe0b9f0b
commit 57fe0b9f0b
parent 529a91f182 519f81ab20
8 changed files with 144 additions and 300 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -270,10 +270,10 @@ end
 module Instiki
  module VERSION #:nodoc:
    MAJOR = 0
-    MINOR = 18
-    TINY  = 1 
+    MINOR = 19
+    TINY  = 0 
    SUFFIX = '(MML+)'
-    PRERELEASE =  false
+    PRERELEASE =  'pre'
    if PRERELEASE
       STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
    else