Marc Alexander c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/config/services.yml

2013-02-07 00:07:59 +01:00

..

info

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

ucp_activate.php

Merge PR #1219 branch 'develop-olympus' into develop

2013-01-27 17:46:11 -05:00

ucp_attachments.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp_confirm.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

ucp_groups.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

2013-02-07 00:07:59 +01:00

ucp_main.php

[ticket/10885] Fix UCP Main Error if no forums exist

2012-08-06 16:01:05 -05:00

ucp_pm_compose.php

Merge branch 'develop-olympus' into develop

2013-01-31 00:32:39 +01:00

ucp_pm_options.php

Merge branch 'develop-olympus' into develop

2012-06-21 10:31:08 +02:00

ucp_pm_viewfolder.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp_pm_viewmessage.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

ucp_pm.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

ucp_prefs.php

Merge PR #1053 branch 'develop-olympus' into develop

2012-12-05 12:21:25 -05:00

ucp_profile.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

ucp_register.php

[ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.

2012-09-09 21:10:29 +02:00

ucp_remind.php

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

ucp_resend.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

ucp_zebra.php

[feature/php-events] Fix naming and doc of core.ucp_add_zebra

2012-08-04 17:50:16 +02:00