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
..
core.js	Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x	2016-03-27 09:59:25 +02:00
editor.js	Merge branch '3.1.x' into 3.2.x	2016-03-10 22:11:07 +01:00
installer.js	[ticket/14487] Add loading indicator while polling status	2016-02-29 16:40:09 +01:00
jquery.min.js	[ticket/12547] Rename jquery.js to jquery.min.js in assets directory	2014-05-15 01:18:26 +03:00
plupload.js	[ticket/14049] Use headers from config when sending Plupload delete request.	2015-07-25 18:56:19 -07:00