phpbb/phpBB/install
Marc Alexander 2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01: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 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars 2012-11-12 14:57:28 +01:00
database_update.php Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars 2012-11-12 14:57:28 +01: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/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. 2012-09-08 14:42:38 +02:00
phpinfo.php