Marc Alexander c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ... Conflicts: phpBB/config/services.yml		2013-02-07 00:07:59 +01:00
..
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00
avatars.yml	[feature/avatars] Move definition of driver_collection to avatars.yml	2013-01-15 22:13:23 +01:00
cron_tasks.yml	[ticket/11257] Do not require set_name() method to exist	2012-12-07 21:25:42 -06:00
migrator.yml	[feature/migrations] Migrations now somewhat works	2013-01-09 16:44:07 -06:00
routing.yml	[feature/controller] Update routing documentation for using query string	2012-11-18 13:40:24 -05:00
services.yml	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars	2013-02-07 00:07:59 +01:00
tables.yml	[feature/migrations] Migrations now somewhat works	2013-01-09 16:44:07 -06:00