diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 12:25:41 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 12:25:41 +0200 |
| commit | e91997496707add4092403e341d6be2c7d2139ae (patch) | |
| tree | e590acb0a89bdb6467250826d6af3071ccdbec88 | |
| parent | 1b109f6f25abd0db9ee20fc01f3b51b71d96bcb9 (diff) | |
| parent | 76a58d654dc896281771ac3d40261d4fda9c193f (diff) | |
| download | symfony-security-e91997496707add4092403e341d6be2c7d2139ae.zip symfony-security-e91997496707add4092403e341d6be2c7d2139ae.tar.gz symfony-security-e91997496707add4092403e341d6be2c7d2139ae.tar.bz2 | |
Merge branch '2.8'
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
| -rw-r--r-- | Core/composer.json | 2 | ||||
| -rw-r--r-- | Csrf/composer.json | 2 | ||||
| -rw-r--r-- | Http/composer.json | 2 | ||||
| -rw-r--r-- | composer.json | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Core/composer.json b/Core/composer.json index a33ea5d..860974e 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.5.9", - "paragonie/random_compat" : "~1.0" + "paragonie/random_compat": "~1.0" }, "require-dev": { "symfony/phpunit-bridge": "~2.8|~3.0", diff --git a/Csrf/composer.json b/Csrf/composer.json index 41dc21c..1510b1d 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.5.9", "symfony/security-core": "~2.8|~3.0", - "paragonie/random_compat" : "~1.0" + "paragonie/random_compat": "~1.0" }, "require-dev": { "symfony/phpunit-bridge": "~2.8|~3.0", diff --git a/Http/composer.json b/Http/composer.json index acfddae..76f1a8b 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -22,7 +22,7 @@ "symfony/http-foundation": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0", "symfony/property-access": "~2.8|~3.0", - "paragonie/random_compat" : "~1.0" + "paragonie/random_compat": "~1.0" }, "require-dev": { "symfony/phpunit-bridge": "~2.8|~3.0", diff --git a/composer.json b/composer.json index 5c6039a..af2c50b 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "symfony/http-foundation": "~2.8|~3.0", "symfony/http-kernel": "~2.8|~3.0", "symfony/property-access": "~2.8|~3.0", - "paragonie/random_compat" : "~1.0" + "paragonie/random_compat": "~1.0" }, "replace": { "symfony/security-core": "self.version", |