Marc Alexander dff950162c Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/phpbb/db/migration/tool/module.php

2016-08-31 21:41:17 +02:00

..

driver

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +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-08-31 21:41:17 +02:00

output_handler

Merge branch 'ticket/14742' into ticket/14742-32x

2016-08-20 22:38:45 +02:00

tools

Merge branch '3.1.x' into 3.2.x

2016-04-03 16:02:50 +02:00

migrator.php

Merge branch 'ticket/14742' into ticket/14742-32x

2016-08-20 22:38:45 +02:00

sql_insert_buffer.php

[ticket/13790] Update phpcs

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