This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Component/Form/Extension
Tobias Schultze d0acda84f2 Merge branch '2.8'
Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/Form/Tests/FormRegistryTest.php
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Ldap/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
	src/Symfony/Component/VarDumper/composer.json
2015-10-29 13:12:54 +01:00
..
Core Merge branch '2.8' 2015-10-29 13:12:54 +01:00
Csrf [Form] removed deprecated features 2015-10-01 16:20:48 +02:00
DataCollector [Form] removed deprecated FormType::getName() 2015-10-01 16:20:48 +02:00
DependencyInjection Merge branch '2.7' into 2.8 2015-10-03 18:42:07 +02:00
HttpFoundation Merge branch '2.7' into 2.8 2015-10-03 18:42:07 +02:00
Templating Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00
Validator Merge branch '2.8' 2015-10-29 13:12:54 +01:00