Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-10-22 05:16:42 +09:00
commit 3760fdeed0
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69

View File

@ -1099,6 +1099,7 @@ desktop/views/pages/deck/deck.tl-column.vue:
desktop/views/pages/deck/deck.user-column.vue:
pinned-notes: "ピン留めされた投稿"
push-to-a-list: "リストに追加"
desktop/views/pages/stats/stats.vue:
all-users: "全てのユーザー"