diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 23:00:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 23:00:56 +0000 |
| commit | fe906cc3f0c8388bcb2a33be9c72ca5365bde0a5 (patch) | |
| tree | a92128b2779b3971d15699b4410c37687446d480 /src/App.vue | |
| parent | 13acdc4a00f7c4e8487de0c95fe69ff110f13e6e (diff) | |
| parent | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (diff) | |
Merge branch 'develop' into 'notifications'
# Conflicts:
# src/main.js
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 923d411b..71e90289 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +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> + <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> <notifications v-if="currentUser"></notifications> </div> </div> |