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
..
css	[ticket/12769] Properly include FA	2015-09-17 18:37:25 +02:00
fonts	[ticket/12769] Fix font permissions	2015-09-17 18:57:33 +02:00
javascript	Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x	2016-03-27 09:59:25 +02:00
plupload	[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.	2015-07-25 18:54:09 -07:00