Marc Alexander 33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842 ...

Conflicts:
	phpBB/includes/acp/acp_groups.php

2013-11-27 14:55:24 +01:00

..

data

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842

2013-11-27 14:55:24 +01:00

tool

[ticket/11995] Fix Revert of config.remove

2013-11-02 18:13:11 +01:00

exception.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

migration.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00