diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 21:28:45 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 21:28:45 +0100 |
| commit | 2059726995834fd81e780b80991efcfe7c27ef1f (patch) | |
| tree | 130ef271226e652da21e4af2b00131bc5b2bfdc3 /Core | |
| parent | a4210450cdb42fecab92ebaf933a3e2bf1cb699b (diff) | |
| parent | 24211b9e8e8061626ef0ee0490790a99af306a45 (diff) | |
| download | symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.zip symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.tar.gz symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.6] Test lowest versions of dependencies
Test lowest versions of dependencies
Fix placeholder date format
Test components using their lowest possible deps
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/composer.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Core/composer.json b/Core/composer.json index 5182a71..2fc50f4 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -20,9 +20,10 @@ }, "require-dev": { "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.4", + "symfony/expression-language": "~2.6", "symfony/http-foundation": "~2.4", - "symfony/validator": "~2.5", + "symfony/translation": "~2.0,>=2.0.5", + "symfony/validator": "~2.5,>=2.5.5", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, |