Igor Wiedler d766ee3fe6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php

2011-11-20 18:45:56 +01:00

..

info

…

ucp_activate.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

ucp_attachments.php

…

ucp_confirm.php

…

ucp_groups.php

…

ucp_main.php

…

ucp_pm_compose.php

…

ucp_pm_options.php

…

ucp_pm_viewfolder.php

…

ucp_pm_viewmessage.php

…

ucp_pm.php

…

ucp_prefs.php

…

ucp_profile.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

ucp_register.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

ucp_remind.php

…

ucp_resend.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

ucp_zebra.php

…