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

..

install_data

[ticket/14510] Prevent infinite loop in add_bots task

2016-03-02 21:48:10 +01:00

install_database

[ticket/14595] Added smtp_port where places where smtp_host exists.

2016-05-14 09:19:26 -07:00

install_filesystem

[ticket/14462] Further speed improvements

2016-02-12 14:31:28 +01:00

install_finish

[ticket/14462] Refactor tasks to be more modular

2016-02-12 14:31:28 +01:00

obtain_data

Merge branch '3.1.x' into 3.2.x

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

requirements

[ticket/14589] Add error messages for failable installer requirements

2016-04-10 10:30:15 +02:00

update_database

[ticket/14393] Fix db update progress bar

2016-03-30 11:05:45 +02:00

update_filesystem

[ticket/14393] Fix init for conflict archive

2016-03-27 20:10:45 +02:00