diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
| commit | 958acbab8d43b7514369f4bc69bc2fe0353eddf2 (patch) | |
| tree | 9c7b9d868f4b1cf8f0e592cdd607999d5484a18c /src/components/user_settings/user_settings.js | |
| parent | 48391a45ba8924e20f280868bca78d77a32c3ddd (diff) | |
| parent | 8c07e63f773a15119f3cf773c083fe3b76306c3f (diff) | |
Merge branch 'polish' into 'develop'
Another one of those MR that fixes many many small-to-medium things
Closes #92, #75, #122, #52, #72, and #87
See merge request pleroma/pleroma-fe!324
Diffstat (limited to 'src/components/user_settings/user_settings.js')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index f046885e..0b13a668 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -1,3 +1,4 @@ +import TabSwitcher from '../tab_switcher/tab_switcher.jsx' import StyleSwitcher from '../style_switcher/style_switcher.vue' const UserSettings = { @@ -23,7 +24,8 @@ const UserSettings = { } }, components: { - StyleSwitcher + StyleSwitcher, + TabSwitcher }, computed: { user () { |