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

..

info

Merge branch 'develop-ascraeus' into develop

2014-10-01 10:34:42 +02:00

acp_attachments.php

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

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

acp_ban.php

[ticket/13454] Fix code sniffer complaints

2016-01-06 13:52:11 +01:00

acp_bbcodes.php

Merge branch '3.1.x'

2016-01-16 23:10:37 +01:00

acp_board.php

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

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

acp_bots.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_captcha.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_contact.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

acp_database.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_disallow.php

[ticket/13454] Fix code sniffer complaints

2016-01-06 13:52:11 +01:00

acp_email.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_extensions.php

Merge branch '3.1.x'

2016-01-12 04:31:15 +01:00

acp_forums.php

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +01:00

acp_groups.php

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

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

acp_icons.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_inactive.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_jabber.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_language.php

Merge branch '3.1.x'

2015-10-14 10:17:04 +02:00

acp_logs.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_main.php

Merge branch '3.1.x'

2015-10-14 16:56:44 +02:00

acp_modules.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_permission_roles.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_permissions.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_php_info.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_profile.php

[ticket/13454] Add excessively removed code back

2016-01-06 13:52:11 +01:00

acp_prune.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_ranks.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_reasons.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

acp_search.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_send_statistics.php

Merge branch '3.1.x'

2015-10-14 10:17:04 +02:00

acp_styles.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

acp_update.php

[ticket/14044] Deduplicate the installers

2015-10-22 21:29:52 +02:00

acp_users.php

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

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

acp_words.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

auth.php

[ticket/14315] Add back roles select for disable javascript

2016-02-16 18:21:04 +01:00