Marc Alexander 382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords ...

Conflicts:
	phpBB/config/services.yml

2013-12-29 13:46:42 +01:00

..

convertors

…

data

…

schemas

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

2013-12-29 13:46:42 +01:00

database_update.php

…

index.php

…

install_convert.php

…

install_install.php

…

install_main.php

…

install_update.php

…

phpinfo.php

…