vendor libs

digitregroup · May 2, 2019 · 7c60f73 · 7c60f73
1 parent 7095c66
commit 7c60f73
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 1. [](#improved)
     * Flex admin: added default search options for flex objects
     * Flex collection and object now fall back to the default template if template file doesn't exist
+    * Updated Vendor libraries including Twig 1.40.1
 1. [](#bugfix)
     * Fixed `$grav['route']` from being modified when the route instance gets modified
     * Fixed Assets options array mixed with standalone priority [#2477](https://github.com/getgrav/grav/issues/2477)

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "kodus/psr7-server": "*",
         "nyholm/psr7": "^1.0",
 
-        "twig/twig": "~1.35",
+        "twig/twig": "~1.4",
         "erusev/parsedown": "1.6.4",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~4.2",

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