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

2019-02-12 20:32:48 +01:00
parent a3ba28eb17 2f80a348c9
commit 0e34e91661
101 changed files with 2587 additions and 351 deletions
@@ -941,7 +941,8 @@ ja:
      <p>オリジナルの出典: <a href="https://github.com/discourse/discourse">Discourse privacy policy</a></p>
    title: "%{instance} 利用規約・プライバシーポリシー"
  themes:
-    default: Mastodon
+    contrast: Mastodon (ハイコントラスト)
+    default: Mastodon (ダーク)
    mastodon-light: Mastodon (ライト)
  time:
    formats: