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

..

provider

Merge branch '3.1.x'

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

auth.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

index.htm

…

provider_collection.php

[ticket/13248] Correctly pass provider name

2014-11-01 21:54:27 +01:00