diff options
| author | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-03-28 14:55:12 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-03-28 14:55:12 +0900 |
| commit | 6b6b7406841e7db7a08bf6a86c87a8613d126452 (patch) | |
| tree | 753d904580ff5cc44ce84981cbaaf1c38d8107e7 /src/App.vue | |
| parent | 90e3ab45d4aee7b693b8e404321adfe8339595e1 (diff) | |
| parent | b32573138b7607b8d9070100fb792f0241a4ba80 (diff) | |
Merge remote-tracking branch 'origin/feature/who-to-follow-panel' into feature/who-to-follow-panel-2
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 2a910bc0..1d8dd6c8 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> <chat-panel v-if="currentUser && chat"></chat-panel> <notifications v-if="currentUser"></notifications> </div> |