Joas Schilling ab6e0bbef9 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	build/build.xml
	phpBB/composer.lock

2016-02-18 18:42:39 +01:00

..

driver

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

extractor

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

migration

Merge branch '3.1.x' into 3.2.x

2016-02-18 18:42:39 +01:00

output_handler

[ticket/14039] Fix migrator's language calls

2015-10-18 18:28:12 +02:00

tools

Merge pull request #4121 from marc1706/ticket/11875

2016-01-18 23:29:41 +01:00

migrator.php

[ticket/14434] Refactored to check migrations when setting them

2016-01-28 12:17:35 -08:00

sql_insert_buffer.php

[ticket/13790] Update phpcs

2015-05-19 22:19:18 +02:00