Joas Schilling 917a5ce0df Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/ucp/ucp_profile.php

2015-02-02 23:23:26 +01:00

..

info

Merge branch 'develop-ascraeus' into develop

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

acp_attachments.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_ban.php

[ticket/13119] Remove unused globals and use the request class

2014-09-30 18:22:06 +02:00

acp_bbcodes.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_board.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_bots.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_captcha.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_contact.php

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

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

acp_database.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_disallow.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_email.php

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:00:48 +01:00

acp_extensions.php

[ticket/13358] Correctly create version_helper in acp_extensions

2014-11-22 15:23:26 +01:00

acp_forums.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_groups.php

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

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

acp_icons.php

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

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

acp_inactive.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_jabber.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_language.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_logs.php

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

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

acp_main.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_modules.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_permission_roles.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_permissions.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_php_info.php

Merge branch 'develop-olympus' into develop-ascraeus

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

acp_profile.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_prune.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_ranks.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_reasons.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

acp_search.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_send_statistics.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_styles.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

acp_update.php

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

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

acp_users.php

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:23:26 +01:00

acp_words.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

auth.php

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

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