diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-30 22:30:24 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-30 22:30:24 +0200 |
| commit | bd79c7984aac80e80b29d466863e5b5105d65150 (patch) | |
| tree | 4db40a25a835caac3040f14a63e0e8ece3bab036 | |
| parent | 394fa02864d7b493622e7b69b03edcce55f5aa34 (diff) | |
| parent | 6941fe98591a35625c634df0aafcc481510fdf7d (diff) | |
| download | symfony-security-bd79c7984aac80e80b29d466863e5b5105d65150.zip symfony-security-bd79c7984aac80e80b29d466863e5b5105d65150.tar.gz symfony-security-bd79c7984aac80e80b29d466863e5b5105d65150.tar.bz2 | |
Merge branch '2.8'
* 2.8:
add dependency required by a replaced package
Add a way to group toolbar info pieces
Added general sf-toolbar-block-right class
Bind input before executing the COMMAND event
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 555b6ec..6167fde 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "php": ">=5.5.9", "symfony/event-dispatcher": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0", + "symfony/property-access": "~2.8|~3.0.0" }, "replace": { "symfony/security-core": "self.version", |