Nathaniel Guse c1840c78c5 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3 ... Conflicts: phpBB/includes/db/migrator.php		2013-03-04 13:48:29 -06:00
..
driver	[feature/migrations] Fixing returns of callables and handling data state	2013-01-09 16:44:08 -06:00
migration	Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop	2013-03-04 13:33:42 -06:00
db_tools.php	Merge remote-tracking branch 'exreaction/ticket/11350' into develop	2013-02-07 00:56:31 +01:00
index.htm	Moved to includes ... since they are included too .. trying to "clean up" structure a little	2003-03-17 10:54:23 +00:00
migrator.php	Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3	2013-03-04 13:48:29 -06:00