Joas Schilling b566686b51 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php

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

..

data

Merge branch 'develop-ascraeus' into develop

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

tool

[ticket/13432] Make sure to add language file when including acp_modules

2015-01-09 13:47:36 +01:00

container_aware_migration.php

[ticket/13489] Fix service configuration

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

exception.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

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