Skip to content

Commit 81d9413

Browse files
committed
Merge branch '2.5' into 2.6
2 parents 9d996d8 + 39bc7e1 commit 81d9413

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"doctrine/common": "*",
1414
"doctrine/doctrine-bundle": "^1.6|^2.0",
1515
"doctrine/orm": "~2.3",
16+
"doctrine/persistence": "^1.0",
1617
"ecommit/util-bundle": "2.5.*@dev",
1718
"symfony/config": "^4.2|^5.0",
1819
"symfony/dependency-injection": "^4.2|^5.0",
@@ -24,8 +25,8 @@
2425
"symfony/options-resolver": "^4.2|^5.0",
2526
"symfony/property-access": "^4.2|^5.0",
2627
"symfony/translation": "^4.2|^5.0",
27-
"symfony/twig-bundle": "^4.2|^5.0",
28-
"twig/extensions": "^1.0"
28+
"symfony/twig-bridge": "^4.2|^5.0",
29+
"symfony/twig-bundle": "^4.2|^5.0"
2930
},
3031
"autoload": {
3132
"psr-4": { "Ecommit\\JavascriptBundle\\": "" }

0 commit comments

Comments
 (0)