summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2024-11-12 12:49:26 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2024-11-12 12:49:26 +0000
commit2b07fe61275519532dfb6fcc10e362b7e745b120 (patch)
treed622357b83bbc5e068b857443da0eb48c8293813
parent805006ca24eee331088d1ff923fec61313fd5258 (diff)
downloadredmine-2b07fe61275519532dfb6fcc10e362b7e745b120.tar.gz
redmine-2b07fe61275519532dfb6fcc10e362b7e745b120.zip
Merge r23259 from trunk to 6.0-stable.
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23260 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--doc/CHANGELOG11
-rw-r--r--lib/redmine/version.rb2
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index d30c050c0..156e8e7f7 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,17 @@ Redmine - project management software
Copyright (C) 2006- Jean-Philippe Lang
https://www.redmine.org/
+== 2024-11-12 v6.0.1
+
+=== [Gems support]
+
+* Defect #41729: Installing Redmine 6.0.0 may cause a LoadError for svg_sprite
+* Patch #41728: Update Rouge gem to 4.5
+
+=== [Issues list]
+
+* Defect #40303: Layout distortion in issue list descriptions with code blocks
+
== 2024-11-10 v6.0.0
=== [Accounts / authentication]
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 4dca811e6..73183f5f5 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -24,7 +24,7 @@ module Redmine
module VERSION
MAJOR = 6
MINOR = 0
- TINY = 0
+ TINY = 1
# Branch values:
# * official release: nil