Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus.

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

...

This commit is contained in:

Andreas Fischer

2011-06-13 22:30:29 +02:00

parent 8a54aa5d68 bf61602a28

commit 32f610fe14

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