aboutsummaryrefslogtreecommitdiff
path: root/src/App.vue
diff options
context:
space:
mode:
authorHenry <spam@hjkos.com>2018-12-05 07:34:27 +0000
committerHenry <spam@hjkos.com>2018-12-05 07:34:27 +0000
commit914386270796fa2ec460b828710ee31ef870ea69 (patch)
treead2ebf199a5bbe2cf5b3c8c04bdd320f5670b067 /src/App.vue
parent9591d179f48b90b072e70b4fc475ae1691b96313 (diff)
parent5eced8bf09ddd169ba174ece4b790d916cea32d9 (diff)
Merge branch 'fix/user-settings-switch' into 'develop'
Switch to "timeline" when pressing user-settings See merge request pleroma/pleroma-fe!397
Diffstat (limited to 'src/App.vue')
-rw-r--r--src/App.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue
index 2f7dc4fe..9d66b9d4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,7 +25,7 @@
<div class="sidebar-bounds">
<div class="sidebar-scroller">
<div class="sidebar">
- <user-panel></user-panel>
+ <user-panel :activatePanel="activatePanel"></user-panel>
<nav-panel :activatePanel="activatePanel"></nav-panel>
<instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
<features-panel v-if="!currentUser"></features-panel>