about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-09-11 16:51:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-09-11 16:51:26 +0200
commitcd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch)
tree0486b73191a98645e0620fefe8743f4a0c44bef5 /app/helpers
parent65f625cf237feb55a21495606d5e2c258bbe50cc (diff)
parentbda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/settings_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index fc03fcf82..ed873ceed 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -8,6 +8,7 @@ module SettingsHelper
     bg: 'Български',
     ca: 'Català',
     co: 'Corsu',
+    cs: 'Čeština',
     cy: 'Cymraeg',
     da: 'Dansk',
     de: 'Deutsch',