phpbb/phpBB/phpbb/db/migration
Joas Schilling b2a26ab5f4 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-12-12 15:24:29 +01:00
..
data Merge branch '3.1.x' 2015-12-12 15:24:29 +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 [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