phpbb/phpBB/includes/ucp/info
Nathan Guse 0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06: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 [ticket/10679] Use module_auth to limit access to the module 2012-12-06 16:33:12 +01:00
ucp_zebra.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00