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

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-04-10 10:06:07 +02:00

..

convert_phpbb20.php

Merge branch '3.1.x'

2015-04-10 10:06:07 +02:00

functions_phpbb20.php

[ticket/10748] Replace direct creations of tools();

2015-02-07 14:41:39 +01:00