diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
| commit | 215662afdee3935f66e5fbd73260e2039f5216de (patch) | |
| tree | 817b578e53b884c4b5facd63c166b522f59a8978 /src/App.vue | |
| parent | c3e7806acbd32483eab497a347f947158ab8febf (diff) | |
| parent | 1a82a00a2b45041c35b72ab16ee34c120341b652 (diff) | |
Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
# static/fontello.json
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/App.vue b/src/App.vue index dbe842ec..1b1c2648 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,6 +31,7 @@ </div> <div class="item"> <router-link + v-if="!hideSitename" class="site-name" :to="{ name: 'root' }" active-class="home" @@ -40,6 +41,7 @@ </div> <div class="item right"> <search-bar + v-if="currentUser || !privateMode" class="nav-icon mobile-hidden" @toggled="onSearchBarToggled" @click.stop.native |