Skip to content

Commit b545db9

Browse files
committed
Merge branch '2.8'
Conflicts: src/Symfony/Bridge/PhpUnit/composer.json src/Symfony/Component/Serializer/composer.json
2 parents 695168a + 85d65ea commit b545db9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/polyfill-php54": "~1.0"
20+
"symfony/polyfill-php55": "~1.0"
2121
},
2222
"require-dev": {
2323
"symfony/yaml": "~2.8|~3.0",

0 commit comments

Comments
 (0)