Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:

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

...

This commit is contained in:

Andreas Fischer

2015-01-30 13:43:05 +01:00

parent c46a6443be 7273591560

commit 899173eebd

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