diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
| commit | af47d51cd14503495c1ee7398ba733ad4c5ed4a4 (patch) | |
| tree | bf2b0df49756e72800a0f34bd5c26d4fb9beabeb /src/App.vue | |
| parent | 9b86fc4dcd05a8f63ff564e117f06caf8046be78 (diff) | |
| parent | e2c5e4eb46143b52ccff21ca0914c5f1b79376fa (diff) | |
Merge branch 'develop' into 'patch-1'
# Conflicts:
# src/i18n/messages.js
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/App.vue b/src/App.vue index a8d17fa7..923d411b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,6 +24,7 @@ <user-panel></user-panel> <nav-panel></nav-panel> <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> + <who-to-follow-panel v-if="currentUser && showWhoToFollowPanel"></who-to-follow-panel> <notifications v-if="currentUser"></notifications> </div> </div> |