Merge branch 'master' into glitch-soc/merge-upstream

2018-11-06 15:22:44 +01:00
parent 34209c0340 7775225d17
commit 36dab188fd
83 changed files with 1045 additions and 89 deletions
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
  "account.badges.bot": "Bot",
  "account.block": "@{name}さんをブロック",
  "account.block_domain": "{domain}全体を非表示",