summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGELOG4
-rw-r--r--lib/redmine/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 26357e94a..1898a7e56 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,10 @@ Redmine - project management software
Copyright (C) 2006-2012 Jean-Philippe Lang
http://www.redmine.org/
+== 2012-09-30 v2.1.2
+
+* Defect #11929: XSS vulnerability in Redmine 2.1.x
+
== 2012-09-30 v2.1.1
* Defect #11290: ParseDate missing in Ruby 1.9x
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index e8f38da23..fbf6dc603 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
module VERSION #:nodoc:
MAJOR = 2
MINOR = 1
- TINY = 1
+ TINY = 2
# Branch values:
# * official release: nil