diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-10 16:26:37 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-10 16:26:37 +0100 |
commit | 2f1aeb2cdba0ee1809dab7ec0d2cafaaa7100a45 (patch) | |
tree | d80744c7b59c6e0b36bd0a349780a91f8317a337 /Core/Util | |
parent | 9b6d5041afee4c5e379c56f3cf2111b989c6c24b (diff) | |
parent | 7efc95077540fd649e1dbd98fb498461be1254ca (diff) | |
download | symfony-security-2f1aeb2cdba0ee1809dab7ec0d2cafaaa7100a45.zip symfony-security-2f1aeb2cdba0ee1809dab7ec0d2cafaaa7100a45.tar.gz symfony-security-2f1aeb2cdba0ee1809dab7ec0d2cafaaa7100a45.tar.bz2 |
Merge branch '2.7'
* 2.7:
fixed deprecation notice
removed usage of the deprecated forms of asset() in the core framework
renamed asset_path() to asset() and added a BC layer
[Asset] added a NullContext class
[Asset] added the component
Added new Forwarded header support for Request::getClientIps
Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder).
[Security] added string representation for core Users
Add Twig loader priority
Conflicts:
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Diffstat (limited to 'Core/Util')
0 files changed, 0 insertions, 0 deletions