Suppression dossier install
Merge branch 'develop-design'
Merge branch 'origin/develop-design'
Merge branch 'origin/develop-design'
Maj phpBBBoostrap
Maj phpBBB
Maj phpBBB
Maj phpBBB
Maj phpBBB
Maj phpBBB
Maj phpBBB
Merge branch 'origin/develop-design'
Maj phpBBB
Maj phpBBB
Merge branch 'noinstall-develop-design' of https://github.com/arnaudgaudin/phpbb3 into arnaudgaudin-noinstall-develop-design

Conflicts:
	.gitignore
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/convertors/functions_phpbb20.php
	phpBB/install/data/confusables.php
	phpBB/install/data/new_normalizer.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/install/install_convert.php
	phpBB/install/install_install.php
	phpBB/install/install_main.php
	phpBB/install/install_update.php
	phpBB/install/phpinfo.php
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/schema_data.sql
	phpBB/install/schemas/sqlite_schema.sql
delete install files
Merge remote-tracking branch 'refs/remotes/origin/noinstall-develop-design' into noinstall-develop

Conflicts:
	.gitignore