Merge branch '1.5' into 2.0

zikula · May 27, 2018 · eefc459 · eefc459
2 parents 46ebb04 + c072818
commit eefc459
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -12,7 +12,7 @@ CHANGELOG - ZIKULA 2.0.x
     - guzzlehttp/guzzle updated from 6.3.2 to 6.3.3
     - phpspec/prophecy updated from 1.7.5 to 1.7.6
     - symfony/polyfill-* updated from 1.7.0 to 1.8.0
-    - symfony/symfony updated from 3.4.8 to 3.4.10
+    - symfony/symfony updated from 3.4.8 to 3.4.11
 
 
 2.0.6 (2018-04-13)

diff --git a/composer.lock b/composer.lock