Merge 2.x into master

sonata-project · Aug 8, 2020 · 64ffa80 · 64ffa80
2 parents 94db2d9 + be0cae0
commit 64ffa80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,8 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.3'
       env: SYMFONY=4.4.*
+    - php: '7.3'
+      env: SYMFONY=5.1.*
     - php: '7.3'
       env: SYMFONY='dev-master as 4.4.x-dev'
     - php: '7.3'

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "symfony/http-foundation": "^4.4 || ^5.1",
         "symfony/http-kernel": "^4.4 || ^5.1",
         "symfony/intl": "^4.4 || ^5.1",
-        "symfony/templating": "^4.4",
+        "symfony/templating": "^4.4 || ^5.1",
         "twig/twig": "^2.9 || ^3.0"
     },
     "conflict": {