Marc Alexander 47b32f1da9 Merge branch '3.1.x' ... Conflicts: phpBB/phpbb/avatar/driver/upload.php tests/avatar/manager_test.php		2015-08-08 22:23:03 +02:00
..
default	Merge branch '3.1.x'	2015-08-08 22:23:03 +02:00
development	[ticket/12632] Add twig.debug and twig.auto_reload in config.yml	2015-05-04 14:43:58 +02:00
installer	[ticket/14052] Translate installer commands	2015-07-27 11:40:12 +02:00
production	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
test	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00