Nathan Guse 61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/config/services.yml
	phpBB/index.php

2012-11-20 23:19:51 -06:00

..

.htaccess

…

cron_tasks.yml

…

notifications.yml

[ticket/11103] Create user loader class, update for DIC

2012-11-20 22:54:16 -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 git://github.com/phpbb/phpbb3 into ticket/11103

2012-11-20 23:19:51 -06:00

tables.yml

[ticket/11103] Create user loader class, update for DIC

2012-11-20 22:54:16 -06:00