Update changelog

2018-03-01 23:41:46 +00:00 · 2018-03-01 23:41:46 +00:00 · 1bc7462ca7
parent de99d84f73
commit 1bc7462ca7
1 changed files with 5 additions and 0 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,8 @@
+next
+----
+
+- Ignore errors during the generation of the .merlin (#569, fixes #568 and #51)
+
 1.0+beta18 (25/02/2018)
 -----------------------