Merge branch '2.7' into 2.8

* 2.7:
  [Security] Fix composer.json
This commit is contained in:
Nicolas Grekas 2015-11-03 12:42:49 +01:00
commit 2c1bb06e54

View File

@ -45,11 +45,6 @@
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/ldap": "~2.8|~3.0.0"
},
"replace": {
"symfony/security-acl": "self.version",
"symfony/security-core": "self.version",
"symfony/security-http": "self.version"
},
"suggest": {
"symfony/class-loader": "For using the ACL generateSql script",
"symfony/finder": "For using the ACL generateSql script",