Merge remote-tracking branch 'origin/stable' into pkgr

pkgr · Mar 12, 2015 · 992447d · 992447d
2 parents 70d6103 + 590b73e
commit 992447d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/version.rb b/lib/version.rb
@@ -4,7 +4,7 @@ module Discourse
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 2
-      TINY  = 0
+      TINY  = 1
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')