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

Merge branch '3.1.x'

2015-02-17 22:24:15 +01:00

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

[ticket/13725] Coding guidelines: static public

2015-03-27 00:02:20 -07:00

html_migrator_output_handler.php

[ticket/13126] Change messages verbosity levels

2014-10-20 19:42:54 +02:00

log_wrapper_migrator_output_handler.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

migrator_output_handler_interface.php

[ticket/13126] Move migrator_output_handler to an interface

2014-10-20 19:41:32 +02:00

migrator.php

Merge branch 'develop-ascraeus' into develop

2015-01-20 23:32:36 +01:00

null_migrator_output_handler.php

[ticket/13126] Fix tests

2014-10-20 20:46:11 +02:00

sql_insert_buffer.php

[ticket/13790] Update phpcs

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