Marc Alexander 1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x ... Conflicts: phpBB/adm/style/acp_icons.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_acp.php phpBB/includes/ucp/ucp_groups.php phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html phpBB/styles/prosilver/template/ucp_avatar_options_remote.html phpBB/styles/subsilver2/template/mcp_topic.html phpBB/styles/subsilver2/template/posting_attach_body.html phpBB/styles/subsilver2/template/posting_body.html phpBB/styles/subsilver2/template/posting_poll_body.html phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html		2016-03-27 09:59:25 +02:00
..
type	Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x	2016-03-27 09:59:25 +02:00
lang_helper.php	[ticket/12759] Cache all lang_options in lang_helper instead	2014-06-27 17:48:37 +05:30
manager.php	[ticket/14037] Minor coding style improvements to event	2015-08-20 10:14:07 +02:00