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

Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml
2018-08-31 19:10:57 +02:00
parent c6942a5283 55880c7098
commit 6f75a9001f
57 changed files with 1292 additions and 424 deletions
--- a/config/application.rb
+++ b/config/application.rb
@ -43,6 +43,7 @@ module Mastodon
      :bg,
      :ca,
      :co,
+      :cy,
      :da,
      :de,
      :el,