-
Tae Hoon authored
# Conflicts: # src/components/user_avatar/user_avatar.js # src/components/user_avatar/user_avatar.vue # src/components/user_settings/user_settings.js
822d6508
# Conflicts: # src/components/user_avatar/user_avatar.js # src/components/user_avatar/user_avatar.vue # src/components/user_settings/user_settings.js