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

..

data

Merge branch '3.1.x'

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

tool

Merge branch '3.1.x'

2015-06-09 20:23:29 +02:00

container_aware_migration.php

…

exception.php

…

helper.php

…

migration.php

…

profilefield_base_migration.php

…

schema_generator.php

…