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

2011-06-04 01:16:08 -05:00 · 2011-06-04 01:16:08 -05:00 · 92e4aaafaf
commit 92e4aaafaf
parent 1464e29f4f 0ae83c3560
2 changed files with 9 additions and 2 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -277,9 +277,9 @@ module Instiki
  module VERSION #:nodoc:
    MAJOR = 0
    MINOR = 19
-    TINY  = 1 
+    TINY  = 2 
    SUFFIX = '(MML+)'
-    PRERELEASE =  false
+    PRERELEASE =  'pre'
    if PRERELEASE
       STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
    else