diff -r 8aa28e68ac44 -r 97b18934d6db CHANGELOG --- a/CHANGELOG Fri Dec 21 13:14:59 2018 +0800 +++ b/CHANGELOG Mon Dec 24 17:55:25 2018 +0100 @@ -1,7 +1,7 @@ Changelog ========= -8.3.3 - in progress +8.3.3 -- 2017-12-24 ------------------- * evolve: properly detect unresolved merge conflict (issue-5966)