diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-24 18:00:58 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-24 18:00:58 +0100 |
| commit | 48526dc543e7776f2f4ac3f22d65a27cc3b7d911 (patch) | |
| tree | ad6e0e6e7ac3e0fcb464f5cb24289f6b12b07c0b /Core | |
| parent | 71583a67fb04833fa05bc754de6a11cddedf1af6 (diff) | |
| parent | fedc844595d0871c5f17169ab82af83085215684 (diff) | |
| download | symfony-security-48526dc543e7776f2f4ac3f22d65a27cc3b7d911.zip symfony-security-48526dc543e7776f2f4ac3f22d65a27cc3b7d911.tar.gz symfony-security-48526dc543e7776f2f4ac3f22d65a27cc3b7d911.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
CS: fix some license headers
CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
use visited lookup with reference to gain performance
Replace GET parameters when changed
[FrameworkBundle][debug:config] added support for dynamic configurations.
[WebProfiler] Fix partial search on url in list
Conflicts:
src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php
src/Symfony/Bridge/Propel1/Form/EventListener/TranslationFormListener.php
Diffstat (limited to 'Core')
0 files changed, 0 insertions, 0 deletions