Merge branch 'master' into develop

73bbef29 · syuilo · 84941cbb · 26567cde · 73bbef29 · 73bbef29
Commit 73bbef29 authored 5 years ago by syuilo
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/src/client/app/common/views/components/settings/profile.vue
@@ -432,7 +432,5 @@ export default Vue.extend({
 	> header
 		padding 8px 0px
 		font-weight bold
-	> div
-		padding-left 16px

 </style>
--- a/src/client/assets/thumbnail-not-available.png
+++ b/src/client/assets/thumbnail-not-available.png