Marc Alexander 77bc8ee68b Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php

2015-06-07 14:59:33 +02:00

..

oauth

…

apache.php

…

base.php

…

db.php

…

index.htm

…

ldap.php

…

provider_interface.php

…