Andreas Fischer 636524fa56 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php

2015-05-06 01:06:21 +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-03 18:44:34 +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

…