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

Merge pull request #3502 from marc1706/ticket/13564

2015-06-04 17:30:09 +02:00

apache.php

[ticket/13301] Fix called function in apche auth module

2014-11-09 01:37:28 +01:00

base.php

[ticket/13564] Allow to specify user id for retrieving auth link data

2015-03-24 17:08:55 +01:00

db.php

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

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

index.htm

…

ldap.php

[ticket/sec-184] Do not output LDAP password to HTML

2015-06-04 14:29:03 +02:00

provider_interface.php

[ticket/13564] Allow to specify user id for retrieving auth link data

2015-03-24 17:08:55 +01:00