Merge branch 'develop' into 'patch-1'

# Conflicts:
#   src/i18n/messages.js

1 files changed, 5 insertions, 2 deletions

diff --git a/src/App.js b/src/App.js
index e9248967..a052e058 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,6 +2,7 @@ import UserPanel from './components/user_panel/user_panel.vue'
 import NavPanel from './components/nav_panel/nav_panel.vue'
 import Notifications from './components/notifications/notifications.vue'
 import UserFinder from './components/user_finder/user_finder.vue'
+import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
 import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
 import ChatPanel from './components/chat_panel/chat_panel.vue'
 
@@ -12,8 +13,9 @@ export default {
     NavPanel,
     Notifications,
     UserFinder,
-    ChatPanel,
-    InstanceSpecificPanel
+    WhoToFollowPanel,
+    InstanceSpecificPanel,
+    ChatPanel
   },
   data: () => ({
     mobileActivePanel: 'timeline'
@@ -27,6 +29,7 @@ export default {
     style () { return { 'background-image': `url(${this.background})` } },
     sitename () { return this.$store.state.config.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
+    showWhoToFollowPanel () { return this.$store.state.config.showWhoToFollowPanel },
     showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel }
   },
   methods: {