Merge branch 'develop' into 'eslint-fix'

# Conflicts: # src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00 · 2019-07-06 20:43:38 +00:00 · 8f53796420
commit 8f53796420
parent 8d6750d9c2 60b413d02c
6 changed files with 63 additions and 158 deletions
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -31,6 +31,8 @@ const UserProfile = {
    }
  },
  created () {
+    // Make sure that timelines used in this page are empty
+    this.cleanUp()
    const routeParams = this.$route.params
    this.load(routeParams.name || routeParams.id)
  },