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

2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -4,6 +4,7 @@ module SettingsHelper
  HUMAN_LOCALES = {
    en: 'English',
    ar: 'العربية',
+    ast: 'l\'asturianu',
    bg: 'Български',
    ca: 'Català',
    co: 'Corsu',