Oliver Schramm fbb9f8859a Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_captcha.php

2015-11-06 13:28:24 +01:00

..

info

Merge branch 'develop-ascraeus' into develop

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

acp_attachments.php

Merge branch '3.1.x'

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

acp_ban.php

[ticket/10572] Unguarded includes in acp files

2015-10-13 11:52:52 -04:00

acp_bbcodes.php

Merge pull request #3618 from marc1706/ticket/13832

2015-06-24 16:36:15 +02:00

acp_board.php

[ticket/10165] Add a "Send test email" feature

2015-09-09 17:51:14 +02:00

acp_bots.php

Merge branch '3.1.x'

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

acp_captcha.php

Merge branch '3.1.x'

2015-11-06 13:28:24 +01:00

acp_contact.php

[ticket/13844] FAQ in new controller format

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

acp_database.php

[ticket/13930] Add missing spaces to code

2015-06-08 13:54:50 +02:00

acp_disallow.php

Merge branch '3.1.x'

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

acp_email.php

Merge branch '3.1.x'

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

acp_extensions.php

Merge branch '3.1.x'

2015-09-16 11:58:53 +02:00

acp_forums.php

Merge pull request #3965 from marc1706/ticket/14234

2015-10-14 08:59:17 +02:00

acp_groups.php

Merge branch '3.1.x'

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

acp_icons.php

[ticket/14157] Allow to set the alt/title attribute on post icons

2015-10-10 15:29:31 +02:00

acp_inactive.php

Merge branch '3.1.x'

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

acp_jabber.php

Merge branch '3.1.x'

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

acp_language.php

Merge branch '3.1.x'

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

acp_logs.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

acp_main.php

Merge branch '3.1.x'

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

acp_modules.php

[ticket/13777] Reorder get_module_infos() method's arguments

2015-05-31 16:03:11 +02:00

acp_permission_roles.php

Merge branch '3.1.x'

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

acp_permissions.php

Merge branch '3.1.x'

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

acp_php_info.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-06-09 13:23:49 +05:30

acp_profile.php

Merge branch '3.1.x'

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

acp_prune.php

Merge branch '3.1.x'

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

acp_ranks.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

acp_reasons.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

acp_search.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

acp_send_statistics.php

Merge branch '3.1.x'

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

acp_styles.php

Merge remote-tracking branch 'upstream/3.1.x'

2015-10-12 11:18:14 +02:00

acp_update.php

[ticket/14044] Deduplicate the installers

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

acp_users.php

[ticket/10572] Remove excessive new line

2015-10-14 15:50:15 +02:00

acp_words.php

[ticket/11768] Re-added the code that got lost in rebase

2015-04-02 19:16:01 +02:00

auth.php

Merge branch '3.1.x'

2015-09-01 21:47:19 +02:00