diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 13:54:00 +0100 |
| commit | 1d6152f4404d40a6113bad2e70326fb5c2145ef4 (patch) | |
| tree | 4edcc500883b3e533c06517b147bf221b06f6bf0 /config/application.rb | |
| parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
| parent | 158c31b9df538691666e5b91f48a0afecd2985fe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 5bade72fc..150fdce6c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -41,6 +41,7 @@ module Mastodon :ar, :ast, :bg, + :bn, :ca, :co, :cs, @@ -54,8 +55,10 @@ module Mastodon :fa, :fi, :fr, + :ga, :gl, :he, + :hi, :hr, :hu, :hy, |