Nathaniel Guse 68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 ... Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html		2012-11-10 10:58:44 -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] Inject table prefix to notifications system instead of constants	2012-11-09 08:48:41 -06:00
services.yml	Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103	2012-11-10 10:58:44 -06:00
tables.yml	[ticket/11103] Inject table prefix to notifications system instead of constants	2012-11-09 08:48:41 -06:00