fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 13:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/config/locales-glitch
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
en.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
es.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
ja.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
ko.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
pl.yml
simple_form.en.yml
simple_form.es.yml
simple_form.ja.yml
simple_form.ko.yml
simple_form.pl.yml
simple_form.zh-CN.yml
zh-CN.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00