diff CHANGELOG @ 3513:b1cc19e5ef24

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 03 Mar 2018 22:25:24 -0500
parents af2602c354d8 3bd642f11313
children 6d03ec17c025
line wrap: on
line diff
--- a/CHANGELOG	Sat Mar 03 22:12:35 2018 -0500
+++ b/CHANGELOG	Sat Mar 03 22:25:24 2018 -0500
@@ -14,6 +14,7 @@
 
   * fold: fix issue related to bookmarks movement (issue5772)
   * amend: take lock before parsing the commit description (issue5266)
+  * legacy: respect 'server.bundle1' config if any is set
 
 7.2.1 --2018-01-20
 -------------------