Merge branch 'release-v1.5.0'

2011-06-27 15:45:46 -07:00 · 2011-06-27 15:45:46 -07:00 · 39be3ac130
parent a75eab1adb 967d0e6baa
commit 39be3ac130
2 changed files with 6 additions and 1 deletions
--- a/doc/CHANGELOG.rdoc
+++ b/doc/CHANGELOG.rdoc
@ -1,5 +1,10 @@
 = ChiliProject changelog

+== 2011-06-27 v1.5.0
+
+* Bug #490: XSS in app/views/auth_sources/index.html.erb
+* Feature #488: Hook for additional formats on Wiki#show page
+
 == 2011-05-27 v1.4.0

 * Bug #81: Replace favicon
--- 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 = 4
+    MINOR = 5
    PATCH = 0 
    TINY  = PATCH # Redmine compat