Merge pull request #698 from Soullivaneuh/twig-deprecate

Fix deprecated twig stuff usage
This commit is contained in:
William Durand 2015-10-22 14:41:15 +02:00
commit 189197dc88
No known key found for this signature in database
GPG Key ID: A509BCF1C1274F3B

View File

@ -22,7 +22,8 @@
}, },
"conflict": { "conflict": {
"jms/serializer": "<0.12", "jms/serializer": "<0.12",
"jms/serializer-bundle": "<0.11" "jms/serializer-bundle": "<0.11",
"twig/twig": "<1.12"
}, },
"require-dev": { "require-dev": {
"symfony/css-selector": "~2.3", "symfony/css-selector": "~2.3",