Merge branch 'release-v1.5.0'

39be3ac1 · Eric Davis · a75eab1a · 967d0e6b · 39be3ac1 · 39be3ac1
Commit 39be3ac1 authored Jun 27, 2011 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CHANGELOG.rdoc doc/CHANGELOG.rdoc +5 -0

version.rb lib/redmine/version.rb +1 -1

No files found.
--- a/doc/CHANGELOG.rdoc
+++ b/doc/CHANGELOG.rdoc
 = 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