Nathaniel Guse a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ... Conflicts: phpBB/install/database_update.php		2013-02-26 15:32:27 -06:00
..
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02: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
notifications.yml	[ticket/11103] Including the set call in the declaration throws errors	2013-01-15 12:29:20 -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	2013-02-26 15:32:27 -06:00
tables.yml	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103	2013-02-11 21:37:15 -06:00