Merge branch 'MDL-64137-master' of git://github.com/bmbrands/moodle

diff --cc message/amd/build/message_drawer_view_search.min.js
index 071d79e,926dd73..43470d3
Binary files differ

diff --cc message/amd/src/message_drawer_view_search.js
Simple merge

diff --cc message/templates/message_drawer_contacts_list.mustache
Simple merge

diff --cc message/templates/message_drawer_conversations_list.mustache
Simple merge

diff --cc message/templates/message_drawer_messages_list.mustache
Simple merge

diff --cc message/templates/message_drawer_non_contacts_list.mustache
Simple merge

diff --cc message/templates/message_drawer_view_group_info_participants_list.mustache
Simple merge