Merge branch 'master' into dev

Corporation-of-Doom · Nov 12, 2018 · 3c9ac56 · 3c9ac56
2 parents 0f972d2 + 52d8d40
commit 3c9ac56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/frontend/src/components/Profile/ProfileEdit.vue b/frontend/src/components/Profile/ProfileEdit.vue
@@ -251,6 +251,7 @@ export default {
 			this.facebook = this.$store.state.user.facebook
 			this.insta = this.$store.state.user.instagram
 			this.edit = false			
+
 		}
 	},
 	mounted() {

diff --git a/frontend/src/views/pages/ManageEvents.vue b/frontend/src/views/pages/ManageEvents.vue
@@ -70,6 +70,7 @@ export default {
         currentList: [],
         user: this.$store.state.user,
         showAddSeminar: false
+
       };
     },
   mounted() {

diff --git a/frontend/src/views/pages/authentication/Login.vue b/frontend/src/views/pages/authentication/Login.vue
@@ -149,6 +149,7 @@ export default {
                   } else {
                     user.manage = []
                     console.log("no manging")
+
                   }
                   console.log(user)
                   this.$store.commit("setLogin", user);