diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-15 19:38:14 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-15 19:38:14 +0100 |
| commit | a9d129faf62f0d99622ddd0b1e87b13ab626816c (patch) | |
| tree | 8f6e8dc2a603fbd2f8a29ccab03bf844ad83a5ba | |
| parent | 9b949283bf2eda8a49a8771eae8e1618515f9358 (diff) | |
| parent | 460c9c40e1f1adb1a9efdeeeeda6fd07517099db (diff) | |
| download | symfony-security-a9d129faf62f0d99622ddd0b1e87b13ab626816c.zip symfony-security-a9d129faf62f0d99622ddd0b1e87b13ab626816c.tar.gz symfony-security-a9d129faf62f0d99622ddd0b1e87b13ab626816c.tar.bz2 | |
Merge remote-tracking branch 'symfony/2.3' into lowest-25
* symfony/2.3:
Test components using their lowest possible deps
Conflicts:
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Validator/composer.json
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 7610542..a734f3b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1", + "symfony/event-dispatcher": "~2.2", "symfony/http-foundation": "~2.1", "symfony/http-kernel": "~2.4" }, @@ -28,6 +28,7 @@ "symfony/security-http": "self.version" }, "require-dev": { + "symfony/locale": "~2.0,>=2.0.5", "symfony/routing": "~2.2", "symfony/validator": "~2.2,<2.5.0", "doctrine/common": "~2.2", |