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

[ticket/14277] Use user_id if available

2015-11-09 09:11:03 +01:00

container_aware_migration.php

[ticket/13489] Fix service configuration

2015-01-20 14:19:55 +01:00

exception.php

…

helper.php

…

migration.php

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00

profilefield_base_migration.php

Merge branch 'develop-ascraeus' into develop

2015-01-20 23:32:36 +01:00

schema_generator.php

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00