phpbb/phpBB/install/convertors
Joas Schilling a3883a6f23 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-06-11 21:00:04 +02:00
..
convert_phpbb20.php Merge branch '3.1.x' 2015-06-11 21:00:04 +02:00
functions_phpbb20.php [ticket/10748] Replace direct creations of tools(); 2015-02-07 14:41:39 +01:00