Merge branch 'develop' into 'feat/conversation-muting'

# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue

1 files changed, 3 insertions, 1 deletions

diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 0f40edf1..846d9415 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -152,6 +152,7 @@ const backendInteractorService = credentials => {
   const unretweet = (id) => apiService.unretweet({ id, credentials })
   const search2 = ({ q, resolve, limit, offset, following }) =>
     apiService.search2({ credentials, q, resolve, limit, offset, following })
+  const searchUsers = (query) => apiService.searchUsers({ query, credentials })
 
   const backendInteractorServiceInstance = {
     fetchStatus,
@@ -216,7 +217,8 @@ const backendInteractorService = credentials => {
     retweet,
     unretweet,
     updateNotificationSettings,
-    search2
+    search2,
+    searchUsers
   }
 
   return backendInteractorServiceInstance