Joas Schilling a3883a6f23 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-06-11 21:00:04 +02:00

..

driver

…

extractor

[ticket/13930] Add missing space to mssql_extractor

2015-06-08 15:55:03 +02:00

migration

Merge branch '3.1.x'

2015-06-11 21:00:04 +02:00

tools

…

html_migrator_output_handler.php

…

log_wrapper_migrator_output_handler.php

…

migrator_output_handler_interface.php

…

migrator.php

…

null_migrator_output_handler.php

…

sql_insert_buffer.php

[ticket/13790] Update phpcs

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