Merge branch '1.5' into 2.0

zikula · Feb 24, 2018 · f058f87 · f058f87
2 parents 7a2e468 + 6a8598a
commit f058f87
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -1,7 +1,7 @@
 CHANGELOG - ZIKULA 2.0.x
 ========================
 
-2.0.5 (unreleased)
+2.0.5 (2018-02-24)
 ------------------
 
  - BC Breaks:
@@ -28,6 +28,7 @@ CHANGELOG - ZIKULA 2.0.x
     - vakata/jstree updated from 3.3.4 to 3.3.5
     - zikula/andreas08-theme updated from 3.0.1 to 3.0.2
 
+
 2.0.4 (2017-12-16)
 ------------------