--- a/changelog	Sun May 06 15:23:02 2018 +0200
+++ b/changelog	Mon May 07 19:32:49 2018 +0200
@@ -1,5 +1,11 @@
 Change Log
 ----------
+Version 18.06:
+- bug fixes
+- Editor
+  -- added a configuration option (Editor->Style page) to show the marker map
+     on the left or right of the editor
+
 Version 18.05:
 - bug fixes
 - General