Oleg Pudeyev f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop ... * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php		2011-05-20 19:50:29 -04:00
..
info	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_activate.php	Merge branch 'develop-olympus' into develop	2011-04-30 20:44:42 -04:00
ucp_attachments.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_confirm.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_groups.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_main.php	[ticket/9684] Fix Forum/Topic-Tracking for global announcements	2011-04-07 13:47:08 +02:00
ucp_pm.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_pm_compose.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_pm_options.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_pm_viewfolder.php	Merge branch 'develop-olympus' into develop	2011-02-28 01:03:55 +01:00
ucp_pm_viewmessage.php	[ticket/8542] Display custom profile fields in private messages	2011-05-20 16:45:29 +02:00
ucp_prefs.php	Merge branch 'develop-olympus' into develop	2011-03-11 21:55:46 -05:00
ucp_profile.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_register.php	Merge branch 'develop-olympus' into develop	2011-03-11 21:55:46 -05:00
ucp_remind.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_resend.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
ucp_zebra.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00