Merge branch '3.0' into merge-3.0-into-master

akeneo · Apr 5, 2019 · 1436cf1 · 1436cf1
2 parents d827318 + ce0dcfe
commit 1436cf1
Show file tree

Hide file tree

Showing 268 changed files with 13,918 additions and 11,652 deletions.
diff --git a/composer.json b/composer.json
@@ -74,7 +74,7 @@
         "symfony/thanks": "^1.0",
         "symfony/polyfill-apcu": "1.4.0",
         "twig/extensions": "1.3.0",
-        "twig/twig": "1.36.0",
+        "twig/twig": "1.38.3",
         "box/spout": "2.7.2",
         "webmozart/assert": "1.3"
     },