From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Jul 2017 18:08:02 +0000 (+0000)
Subject: Merged r16825.
X-Git-Tag: 3.4.2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d2d10b08a9b2738daef04ade5a5dd562ff17dcb;p=redmine.git

Merged r16825.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ab1e832c4..2e87e583f 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,25 @@ Redmine - project management software
 Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2017-07-16 v3.4.2
+
+=== [Administration]
+
+* Defect #26393: Error when unchecking all settings on some plugins configurations
+
+=== [Attachments]
+
+* Defect #26379: Fix thumbnail rendering for images with height >> width
+
+=== [Time tracking]
+
+* Defect #26387: Error displaying time entries filtered by Activity
+
+=== [UI]
+
+* Defect #26445: Text formatting not applied to commit messages even if enabled in settings
+* Patch #26424: Avatar Spacing in Headlines
+
 == 2017-07-09 v3.4.1
 
 === [Issues list]
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 7bee0776f..06dee894d 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 4
-    TINY  = 1
+    TINY  = 2
 
     # Branch values:
     # * official release: nil