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

Conflicts:
	phpBB/install/database_update.php

2013-03-04 00:22:15 +01:00

..

ucp_attachments.php

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

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

ucp_groups.php

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

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

ucp_main.php

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

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

ucp_notifications.php

[ticket/11103] UCP Notification List

2012-10-13 20:02:38 -05:00

ucp_pm.php

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

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

ucp_prefs.php

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

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

ucp_profile.php

Merge branch 'develop' into feature/avatars

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

ucp_zebra.php

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

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