Merge branch '3.1.x'

Browse Source

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql

...

This commit is contained in:

Joas Schilling

2015-06-11 23:29:55 +02:00

parent a3883a6f23 9238d28353

commit a49bd38e83

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