Updates for 3.1.5 release.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 2770527430e0c9013fc1ae1f0f96fa7e8098e32b..0235f419297b55e06ffcbb9bfdc9643ea0da6504 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,12 @@ Redmine - project management software
 Copyright (C) 2006-2016  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2016-05-05 v3.1.5
+
+* Defect #22305: Highlighting of required and read-only custom fields broken in Workflow editor.
+* Defect #22331: bundler error: Ruby 1.9.3 = "mime-types-data requires Ruby version >= 2.0."
+* Patch #22721: Check that the file is actually an image before generating the thumbnail
+
 == 2016-03-13 v3.1.4
 
 * Defect #21588: Simplified Chinese "field_cvs_module" translation has problem (Patch #21430)

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