diff lib/redmine/.svn/text-base/version.rb.svn-base @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Thu, 14 Jul 2011 10:37:36 +0100
parents 753f1380d6bc 0c939c159af4
children
line wrap: on
line diff
--- a/lib/redmine/.svn/text-base/version.rb.svn-base	Thu Jul 14 10:21:43 2011 +0100
+++ b/lib/redmine/.svn/text-base/version.rb.svn-base	Thu Jul 14 10:37:36 2011 +0100
@@ -4,7 +4,7 @@
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     # Branch values:
     # * official release: nil