Marc Alexander 1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x ...

Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html

2016-03-27 09:59:25 +02:00

..

sphinx

…

base.php

…

fulltext_mysql.php

Merge branch '3.1.x'

2015-10-12 13:38:42 +02:00

fulltext_native.php

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

fulltext_postgres.php

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

fulltext_sphinx.php

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

index.htm

…