phpbb/phpBB/includes/ucp/info
Nathaniel Guse 68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -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 Merge branch 'develop-olympus' into develop 2012-10-29 15:16:59 -04:00
ucp_zebra.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00