Marc Alexander 45ba2e9770 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php

2016-07-07 19:19:40 +02:00

..

obtain_admin_data.php

…

obtain_board_data.php

…

obtain_database_data.php

…

obtain_email_data.php

…

obtain_file_updater_method.php

…

obtain_imagick_path.php

…

obtain_server_data.php

…

obtain_update_files.php

…

obtain_update_ftp_data.php

…

obtain_update_settings.php

…