Merge branch '3.1.x' into 3.2.x

Browse Source

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

...

This commit is contained in:

Marc Alexander

2016-07-31 15:38:50 +02:00

parent 69d2bad929 4ac2547d62

commit bd1d734dcc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available