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

Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
parent ab646fac5f d0c2c52783
commit 5cadb47238
180 changed files with 1537 additions and 432 deletions
@@ -63,6 +63,7 @@
  "column.notifications": "通知",
  "column.pins": "固定されたトゥート",
  "column.public": "連合タイムライン",
+  "column.status": "Toot",
  "column_back_button.label": "戻る",
  "column_header.hide_settings": "設定を隠す",
  "column_header.moveLeft_settings": "カラムを左に移動する",