Merge branch 'release' into develop

This commit is contained in:
SabreCat
2017-12-01 21:32:28 +00:00
2 changed files with 3 additions and 1 deletions

View File

@@ -311,6 +311,8 @@ export default {
},
methods: {
checkUserAchievements () {
if (this.user.needsCron) return;
// List of prompts for user on changes. Sounds like we may need a refactor here, but it is clean for now
if (!this.user.flags.welcomed) {
this.$store.state.avatarEditorOptions.editingUser = false;