Joas Schilling 7f7b09fdeb Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php

2016-01-09 18:45:32 +01:00

..

data

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

tool

…

container_aware_migration.php

…

exception.php

…

helper.php

…

migration.php

…

profilefield_base_migration.php

…

schema_generator.php

…