phpbb/phpBB/install/convertors
Joas Schilling 05851e2b4b 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-08-23 18:27:30 +02:00
..
convert_phpbb20.php Merge branch '3.1.x' 2015-08-23 18:27:30 +02:00
functions_phpbb20.php [ticket/8708] Add f_announce_global permission 2015-07-19 21:26:47 +02:00