diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:26:25 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-10 11:26:25 +0200 |
| commit | a08da3494fc2019ec4babbc82b952c2ee0b6b91c (patch) | |
| tree | 6b09a97cb065f7a0157bf07c3ff282e90e8512ee /Csrf/Tests | |
| parent | 13818e3015a2a20025ae65b6f57756795eaeda7e (diff) | |
| parent | 94e661a60e9cca2c83879a88584fed6e1514bd00 (diff) | |
| download | symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.zip symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.tar.gz symfony-security-a08da3494fc2019ec4babbc82b952c2ee0b6b91c.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
[tests] Use @requires annotation when possible
[ci] Enable collecting and replaying skipped tests
[Process] Workaround buggy PHP warning
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Conflicts:
composer.json
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
Diffstat (limited to 'Csrf/Tests')
0 files changed, 0 insertions, 0 deletions