Merge branch 'release-v1.5.4' into stable-1.x

b2bbc1cb · Holger Just · 4e3fe484 · 12d150bb · b2bbc1cb · b2bbc1cb
Commit b2bbc1cb authored Oct 31, 2011 by Holger Just
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

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

No files found.
--- a/doc/CHANGELOG.rdoc
+++ b/doc/CHANGELOG.rdoc
 = ChiliProject changelog

+== 2011-10-31 v1.5.4
+
+* Bug #647: XSS: User input for images is not properly sanitized
+
 == 2011-10-04 v1.5.3

 * Bug #619: Redmine.pm allows anonymous read access to repositories even if Anonymous role prohibits it

--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 1
    MINOR = 5
-    PATCH = 3
+    PATCH = 4
    TINY  = PATCH # Redmine compat

    def self.revision