Marc Alexander dff950162c Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/phpbb/db/migration/tool/module.php

2016-08-31 21:41:17 +02:00

..

config_text.php

[ticket/14742] Fix comments in migrator

2016-08-20 03:35:38 +02:00

config.php

[ticket/14742] Fix comments in migrator

2016-08-20 03:35:38 +02:00

module.php

Merge branch '3.1.x' into 3.2.x

2016-08-31 21:41:17 +02:00

permission.php

[ticket/14742] Fix comments in migrator

2016-08-20 03:35:38 +02:00

tool_interface.php

…