Nils Adermann 6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus ... * github-nickvergessen/ticket/11917: [ticket/11917] Move OAuth Module to the bottom while installing [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend Conflicts: phpBB/install/install_install.php		2014-04-24 11:33:00 +02:00
..
convertors	[prep-release-3.1.0-b2] Update version to 3.1.0-b2	2014-03-30 22:08:10 +02:00
data	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
schemas	Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus	2014-04-06 22:26:27 +02:00
database_update.php	[ticket/12193] Fix broken HTML if SQL error occurs during migration	2014-04-19 16:58:38 +02:00
index.php	Merge branch 'develop-olympus' into develop-ascraeus	2014-03-26 23:35:57 -04:00
install_convert.php	Merge branch 'develop-olympus' into develop-ascraeus	2014-04-10 15:44:47 +02:00
install_install.php	Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus	2014-04-24 11:33:00 +02:00
install_main.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
install_update.php	[ticket/12324] Correctly create di container if config/ is missing from update/	2014-03-29 23:02:37 +01:00
phpinfo.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00