Merge branch 'MDL-64134-master' of git://github.com/ryanwyllie/moodle

dimaip · Jan 16, 2019 · 2a2fa61 · 2a2fa61
2 parents 6e683cd + 9acc0bc
commit 2a2fa61
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 63 deletions.
diff --git a/lang/en/message.php b/lang/en/message.php
@@ -203,9 +203,6 @@
 $string['searchforuser'] = 'Search for a user';
 $string['searchforuserorcourse'] = 'Search for a user or course';
 $string['searchmessages'] = 'Search messages';
-$string['searchnocontactsfound'] = 'No contacts found';
-$string['searchnomessagesfound'] = 'No messages found';
-$string['searchnononcontactsfound'] = 'No non contacts found';
 $string['searchcombined'] = 'Search people and messages';
 $string['seeall'] = 'See all';
 $string['selectmessagestodelete'] = 'Select messages to delete';

diff --git a/message/amd/build/message_drawer_view_search.min.js b/message/amd/build/message_drawer_view_search.min.js