From 56ddeec8f3452a5b75af713a40d0b5e8fa75b3cd Mon Sep 17 00:00:00 2001
From: Foxhkron <foxhkron@toromino.de>
Date: Sun, 19 Aug 2018 01:23:03 +0200
Subject: Merge upstream

---
 src/components/user_settings/user_settings.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/components/user_settings/user_settings.js')

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 2b2de913..f046885e 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -18,7 +18,8 @@ const UserSettings = {
       deleteAccountError: false,
       changePasswordInputs: [ '', '', '' ],
       changedPassword: false,
-      changePasswordError: false
+      changePasswordError: false,
+      activeTab: 'profile'
     }
   },
   components: {
@@ -235,6 +236,9 @@ const UserSettings = {
             this.changePasswordError = res.error
           }
         })
+    },
+    activateTab (tabName) {
+      this.activeTab = tabName
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2