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/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -8,6 +8,7 @@ module SettingsHelper
    bg: 'Български',
    ca: 'Català',
    co: 'Corsu',
+    cy: 'Cymraeg',
    da: 'Dansk',
    de: 'Deutsch',
    el: 'Ελληνικά',