diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-28 08:51:00 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-28 08:51:00 +0200 |
commit | 5868cf639eb64839f68c6f22e79122f0c90ec222 (patch) | |
tree | f956f8a2a7add2fe1253d430ecd93c9780abb513 | |
parent | ae2c4c820d9aca6ad7eac272e9c18f72c15dc04a (diff) | |
parent | a9d8a5f5edbe61386902af3e03112dcd3b200297 (diff) | |
download | symfony-security-5868cf639eb64839f68c6f22e79122f0c90ec222.zip symfony-security-5868cf639eb64839f68c6f22e79122f0c90ec222.tar.gz symfony-security-5868cf639eb64839f68c6f22e79122f0c90ec222.tar.bz2 |
Merge branch '2.7' into 2.8
* 2.7:
[Security] fixed composer.json
-rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index cc3a319..e4e9a8b 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "symfony/validator": "For using the user password constraint", "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs", "symfony/expression-language": "For using the expression voter", - "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5" + "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", "paragonie/random_compat": "" }, "autoload": { |