Marc Alexander 6337407192 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php

2015-05-22 11:51:25 +02:00

..

data

Merge branch '3.1.x'

2015-05-22 11:51:25 +02:00

tool

Merge branch 'develop-ascraeus' into develop

2015-01-30 17:48:54 +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