Nils Adermann f958d05aed Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2015-05-30 10:58:40 +02:00

..

driver

…

extractor

Merge branch '3.1.x'

2015-05-06 01:06:21 +02:00

migration

Merge branch '3.1.x'

2015-05-22 11:51:25 +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