mirror of https://github.com/tootsuite/mastodon
9b861d56a9
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. |
||
|---|---|---|
| .. | ||
| en.yml | ||
| es.yml | ||
| ja.yml | ||
| ko.yml | ||
| 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 | ||