Merged r17377 to 3.4-stable.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 83f1b7c3336739e2d794784d5284c95c03aafcf3..1686ad817747e3ebba982fad9384448dc1c39e1c 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,46 @@ Redmine - project management software
 Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2018-06-10 v3.4.6
+
+=== [Issues]
+
+* Defect #27863: If version is closed or locked  subtasks don't get copied
+* Defect #28765: Copying an issue fails if the issue is watched by a locked user
+* Patch #28649: Log automatic rescheduling of following issues to journal
+
+=== [Permissions and roles]
+
+* Defect #28693: Irrelevant permission is required to access some tabs in project settings page
+
+=== [Project settings]
+
+* Defect #27122: Filter for version name should be case-insensitive
+
+=== [SCM]
+
+* Defect #28725: Mercurial 4.6 compatibility
+
+=== [Text formatting]
+
+* Defect #28469: Syntax highlighter does not work if language name is single-quoted
+
+=== [Translations]
+
+* Patch #28881: Fix Japanese mistranslation for label_comment_added
+
+=== [UI]
+
+* Defect #22023: Issue id input should get focus after adding related issue
+
+=== [UI - Responsive]
+
+* Defect #28523: Display horizontal scroll bar of plugins table when overflow occurs on small screen
+
+=== [Wiki]
+
+* Patch #27090: Show the number of attachments on wiki pages
+
 == 2018-04-07 v3.4.5
 
 === [Custom fields]

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