Marc Alexander 382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords ...

Conflicts:
	phpBB/config/services.yml

2013-12-29 13:46:42 +01:00

..

data

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

2013-12-29 13:46:42 +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