aboutsummaryrefslogtreecommitdiff
path: root/src/App.js
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2016-11-07 11:56:14 +0100
committerRoger Braun <roger@rogerbraun.net>2016-11-07 11:56:14 +0100
commitcf972e968cd1e059c4a7a05a9a3d42f3da05414b (patch)
tree2d7d9ee5408397f1ac5d36fa98943158d5a105c4 /src/App.js
parentacc439f26684d3d188542e904190532ac781c936 (diff)
parent83e7add2c7cd3d7b878c82ffb86e09479bff3500 (diff)
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe
Diffstat (limited to 'src/App.js')
-rw-r--r--src/App.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/App.js b/src/App.js
index 3c677566..c3e5164a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,9 +1,11 @@
import UserPanel from './components/user_panel/user_panel.vue'
+import NavPanel from './components/nav_panel/nav_panel.vue'
export default {
name: 'app',
components: {
- UserPanel
+ UserPanel,
+ NavPanel
},
computed: {
user () { return this.$store.state.users.currentUser || {} },