diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-07-15 19:09:01 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-07-15 19:09:01 +0000 |
| commit | 3370dd80dc4644f2bff053b97b18698cd2abb550 (patch) | |
| tree | 0f4ad9f266eafada88cf6314a276f30257a1f116 /src/App.vue | |
| parent | 7ed9d17ce745abc38a27d4994452a136357aba46 (diff) | |
| parent | e9b452575b9a5ef87808898086771ae806fc3a8b (diff) | |
Merge branch 'develop' into 'feat/conversation-muting'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/App.vue b/src/App.vue index 758c9fce..be4d1f75 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,9 +38,9 @@ </router-link> </div> <div class="item right"> - <user-finder - class="button-icon nav-icon mobile-hidden" - @toggled="onFinderToggled" + <search-bar + class="nav-icon mobile-hidden" + @toggled="onSearchBarToggled" /> <router-link class="mobile-hidden" |