Merge branch '3.1.x' into 3.2.x

Browse Source

Conflicts:
	phpBB/install/database_update.php

...

This commit is contained in:

Marc Alexander

2016-04-06 20:54:35 +02:00

parent a319d58d03 12f5c0405e

commit cdc7f1722d

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