Merge branch 'release-v1.3.0'

2011-05-01 13:56:36 -07:00 · 2011-05-01 13:56:36 -07:00 · 9d13deee46
parent afe5a2b2e8 07772e7eb7
commit 9d13deee46
2 changed files with 7 additions and 1 deletions
--- a/doc/CHANGELOG.rdoc
+++ b/doc/CHANGELOG.rdoc
@ -1,5 +1,11 @@
 = ChiliProject changelog

+== 2011-05-01 v1.3.0
+
+* Bug #309: The login screen after lost_password redirects back to lost_password after you login
+* Bug #347: Potential Security Vulnerability - Execution After Redirect
+* Bug #352: Errorpage should be modified
+
 == 2011-03-27 v1.2.0

 * Bug #209: Don't hardcode user viewable labels (like "Path to .git repository")
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@ -3,7 +3,7 @@ require 'rexml/document'
 module Redmine
  module VERSION #:nodoc:
    MAJOR = 1
-    MINOR = 2
+    MINOR = 3
    PATCH = 0 
    TINY  = PATCH # Redmine compat