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

..

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'

2016-01-09 18:45:32 +01:00

output_handler

[ticket/14039] Fix migrator's language calls

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

tools

[ticket/13454] Remove more unused variables

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

migrator.php

[ticket/13454] Remove unused variables

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

sql_insert_buffer.php

[ticket/13790] Update phpcs

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