aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-12 16:57:18 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-12 16:57:18 +0000
commit6ea5cfe71ee9ae5669c44f154b7ca5dae1211551 (patch)
tree5fafbd876eb22501f1753739624d4e1676122d7e /src/main.js
parent2330170d2305b664f623b9fe8b46d075086b13b5 (diff)
parentd7d787b84cb8e36ad7f622054808f0e66c496309 (diff)
Merge branch 'feature/locked-accounts' into 'develop'
Feature/locked accounts See merge request pleroma/pleroma-fe!274
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.js b/src/main.js
index 0c964dcc..bacd7f6d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@ import UserProfile from './components/user_profile/user_profile.vue'
import Settings from './components/settings/settings.vue'
import Registration from './components/registration/registration.vue'
import UserSettings from './components/user_settings/user_settings.vue'
+import FollowRequests from './components/follow_requests/follow_requests.vue'
import statusesModule from './modules/statuses.js'
import usersModule from './modules/users.js'
@@ -118,6 +119,7 @@ window.fetch('/static/config.json')
{ name: 'mentions', path: '/:username/mentions', component: Mentions },
{ name: 'settings', path: '/settings', component: Settings },
{ name: 'registration', path: '/registration', component: Registration },
+ { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
{ name: 'user-settings', path: '/user-settings', component: UserSettings }
]