Joas Schilling 05851e2b4b Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-08-23 18:27:30 +02:00

..

v30x

Merge branch '3.1.x'

2015-05-03 16:45:10 +02:00

v31x

[prep-release-3.1.6] Add migration for 3.1.6-RC1

2015-08-23 16:54:43 +02:00

v310

Merge branch '3.1.x'

2015-08-10 13:20:04 +02:00

v320

Merge pull request #3698 from s9e/ticket/13935

2015-08-05 12:59:55 +02:00