Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ... Conflicts: phpBB/includes/functions.php		2013-10-03 10:04:59 +02:00
..
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00
auth_providers.yml	[feature/passwords] Inject passwords manager into auth providers	2013-10-02 13:28:38 +02:00
avatars.yml	[ticket/11700] Move all recent code to namespaces	2013-09-16 00:25:27 +02:00
cron_tasks.yml	[ticket/11700] Move all recent code to namespaces	2013-09-16 00:25:27 +02:00
feed.yml	[ticket/11700] Move all recent code to namespaces	2013-09-16 00:25:27 +02:00
migrator.yml	[ticket/11700] Move all recent code to namespaces	2013-09-16 00:25:27 +02:00
notifications.yml	[ticket/11700] Fix installation after develop merge	2013-09-16 03:14:39 +02:00
passwords.yml	[feature/passwords] Pass config via service container to driver helper	2013-09-28 12:42:11 +02: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/passwords	2013-10-03 10:04:59 +02:00
tables.yml	[feature/oauth] Fix more errors related to sql changes	2013-07-23 22:29:27 -04:00