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

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-12-12 15:24:29 +01:00

..

driver

[feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS

2015-11-24 07:31:37 +00:00

extractor

[ticket/13930] Add missing space to mssql_extractor

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

migration

Merge branch '3.1.x'

2015-12-12 15:24:29 +01:00

output_handler

[ticket/14039] Fix migrator's language calls

2015-10-18 18:28:12 +02:00

tools

…

migrator.php

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

sql_insert_buffer.php

…