diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-19 06:14:21 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-19 06:14:21 +0900 |
| commit | 73bbef2922c3b3dd627aa9bdf78b0f9963e72c55 (patch) | |
| tree | f5d4e0a3b3440b547520aa6e10914ed1c99fbdd7 /src | |
| parent | Update CHANGELOG.md (diff) | |
| parent | :art: (diff) | |
| download | misskey-73bbef2922c3b3dd627aa9bdf78b0f9963e72c55.tar.gz misskey-73bbef2922c3b3dd627aa9bdf78b0f9963e72c55.tar.bz2 misskey-73bbef2922c3b3dd627aa9bdf78b0f9963e72c55.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/settings/profile.vue | 2 | ||||
| -rw-r--r-- | src/client/assets/thumbnail-not-available.png | bin | 0 -> 5705 bytes |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/settings/profile.vue b/src/client/app/common/views/components/settings/profile.vue index edfc5a9edf..47b289c8ce 100644 --- 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> diff --git a/src/client/assets/thumbnail-not-available.png b/src/client/assets/thumbnail-not-available.png Binary files differnew file mode 100644 index 0000000000..07cad9919c --- /dev/null +++ b/src/client/assets/thumbnail-not-available.png |
