Updates for 3.2.6 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 3f448412752f4a8d30bf4f54827c8c78a05e306f..33eba8e0b86d516d09c71b0914d07b6c6846f2b4 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,29 @@ Redmine - project management software
 Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2017-04-09 v3.2.6
+
+Defect #22335: Images with non-ASCII file names are not shown in PDF
+Defect #24271: htmlentities warning
+Defect #24869: Circular inclusion detected when including a wiki page with the same name
+Defect #24875: Issues API does not respect time_entries_visibility
+Defect #24999: Mercurial 4.1 compatibility
+Defect #25371: Git 2.9 compatibility
+Defect #25478: Related to "no open issues" shows all issues
+Patch #20661: Show visible spent time link for users allowed to view time entries.
+Patch #24824: Traditional Chinese translation (to r16179)
+Patch #24886: Japanese translation for 3.2-stable
+Patch #24949: Bulgarian translation for 3.2-stable
+Patch #25458: Portuguese translation for 3.2-stable
+Patch #25505: Russian translation for 3.2-stable
+Patch #25526: Revert API change in spent_hours field in issue#show
+Defect #23793: Information leak when rendering of Wiki links
+Defect #23803: Information leak when rendering Time Entry activities
+Defect #24199: Stored XSS with SVG attachments
+Defect #24307: Redmine.pm doesn't check that the repository module is enabled on project
+Defect #24416: Use redirect to prevent password reset tokens in referers
+Defect #25503: Improper markup sanitization in user content
+
 == 2017-01-07 v3.2.5
 
 * Defect #14658: Wrong activity timezone on user page

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 11f4fbcfc9add1e15e114366d3040238c79ed0f9..3e9f529a8ee499798fe8d357d04d3623363ebe32 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
 
     # Branch values:
     # * official release: nil