Merge branch 'stable'

eded4470 · Eric Davis · 8b990471 · 3dc373ee · eded4470 · eded4470
Commit eded4470 authored Aug 01, 2011 by Eric Davis
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-08-01 v2.1.1
+
+* Bug #547: Multiple XSS vulnerabilities
+
 == 2011-07-29 v2.1.0

 * Bug #191: Add Next/Previous links to the top of search results

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

    # Used by semver to define the special version (if any).