summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-05 18:29:27 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-05 18:29:27 +0000
commit9e272f66d5148240691a9e5097716b597faee18f (patch)
tree44d462f7c2238d3372a9488f71593eae259d2cb5
parent515350ed56a1e0f75c81fe6425f8671e8ed5052d (diff)
downloadredmine-9e272f66d5148240691a9e5097716b597faee18f.tar.gz
redmine-9e272f66d5148240691a9e5097716b597faee18f.zip
Updates for 3.1.5 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15367 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--doc/CHANGELOG6
-rw-r--r--lib/redmine/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 277052743..0235f4192 100644
--- 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 c2a47ac6e..6eac73676 100644
--- 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