phpbb/phpBB/install
Nathan Guse 61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
2012-11-20 23:19:51 -06:00
..
convertors Merge branch 'develop-olympus' into develop 2012-10-06 06:15:01 +02:00
data [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
schemas Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-10 10:58:44 -06:00
database_update.php Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-11-20 23:19:51 -06:00
index.php Merge pull request #1056 from igorw/feature/compiled-dic 2012-11-11 09:05:15 -08:00
install_convert.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
install_install.php Merge remote-tracking branch 'igorw/ticket/11183' into develop 2012-11-10 14:02:45 +01: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/11213] Add missing global in install_update.php 2012-11-17 05:27:36 +01:00
phpinfo.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00