diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-02 12:17:39 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-02 12:17:39 +0000 |
commit | 151a49b319faadd730a75778922846b94aa00b3a (patch) | |
tree | fc71150310fe38d6b394c02331df126e0cb1ed1d /lib | |
parent | ded234794e8576e9cfd3bb8b0288f0e6fbe3ca5d (diff) | |
download | redmine-151a49b319faadd730a75778922846b94aa00b3a.tar.gz redmine-151a49b319faadd730a75778922846b94aa00b3a.zip |
Merged r4618 and r4619 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4620 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index 48a9b595a..8d786afb7 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -3,8 +3,8 @@ require 'rexml/document' module Redmine module VERSION #:nodoc: MAJOR = 1 - MINOR = 0 - TINY = 5 + MINOR = 1 + TINY = 0 # Branch values: # * official release: nil |