Updates for 3.2.5 release.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0634f8b8ff911dc3e1719d1862aa801793151e84..3f448412752f4a8d30bf4f54827c8c78a05e306f 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,9 +1,24 @@
 == Redmine changelog
 
 Redmine - project management software
-Copyright (C) 2006-2016  Jean-Philippe Lang
+Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2017-01-07 v3.2.5
+
+* Defect #14658: Wrong activity timezone on user page
+* Defect #22034: Locked users disappear from project settings
+* Defect #24092: bundler error: selenium-webdriver requires Ruby version >= 2.0.
+* Defect #24156: Redmine might create many AnonymousUser and AnonymousGroup entries
+* Defect #24297: Show action not allowed for time entries in closed projects
+* Defect #24348: acts_as_versioned use old style (Rails 2.x) of method call for #all
+* Defect #24646: X-Sendfile is missing in response headers
+* Defect #24693: Spent time on subtasks should also be reassigned when deleting an issue
+* Defect #24718: Prevent from reassigning spent time to an issue that is going to be deleted
+* Defect #24722: Error when trying to reassign spent time when deleting issues from different projects
+* Patch #24283: Validate length of string fields
+* Patch #24296: Add tablename to siblings query to prevent AmbiguousColumn errors
+
 == 2016-10-10 v3.2.4
 
 * Defect #23067: Custom field List Link values to URL breaks on entries with spaces

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 79483a5d7111f2035325deb4c0d5126f9ae7c568..11f4fbcfc9add1e15e114366d3040238c79ed0f9 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  = 4
+    TINY  = 5
 
     # Branch values:
     # * official release: nil