mirror of
https://github.com/retailcrm/NelmioApiDocBundle.git
synced 2025-02-02 15:51:48 +03:00
Merge pull request #698 from Soullivaneuh/twig-deprecate
Fix deprecated twig stuff usage
This commit is contained in:
commit
189197dc88
@ -22,7 +22,8 @@
|
||||
},
|
||||
"conflict": {
|
||||
"jms/serializer": "<0.12",
|
||||
"jms/serializer-bundle": "<0.11"
|
||||
"jms/serializer-bundle": "<0.11",
|
||||
"twig/twig": "<1.12"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/css-selector": "~2.3",
|
||||
|
Loading…
x
Reference in New Issue
Block a user