Merge branch 'stable'

This commit is contained in:
Eric Davis 2011-08-01 16:56:59 -07:00
commit eded447079
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,9 @@
= ChiliProject changelog = ChiliProject changelog
== 2011-08-01 v2.1.1
* Bug #547: Multiple XSS vulnerabilities
== 2011-07-29 v2.1.0 == 2011-07-29 v2.1.0
* Bug #191: Add Next/Previous links to the top of search results * Bug #191: Add Next/Previous links to the top of search results

View File

@ -17,7 +17,7 @@ module Redmine
module VERSION #:nodoc: module VERSION #:nodoc:
MAJOR = 2 MAJOR = 2
MINOR = 1 MINOR = 1
PATCH = 0 PATCH = 1
TINY = PATCH # Redmine compat TINY = PATCH # Redmine compat
# Used by semver to define the special version (if any). # Used by semver to define the special version (if any).