Nathan Guse 0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 ... Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html		2012-12-07 21:14:39 -06:00
..
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00
cron_tasks.yml	Merge remote-tracking branch 'upstream/develop' into feature/dic	2012-08-25 17:00:40 +02:00
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 github.com:EXreaction/phpbb3 into ticket/11103	2012-12-07 21:14:39 -06:00
tables.yml	[ticket/11103] Create user loader class, update for DIC	2012-11-20 22:54:16 -06:00