2 Commits (c048f832c1b92ae81631d46b381b1458708a0ff9)

Author	SHA1	Message	Date
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
otrapersona	29870d2be6	Glitchsoc translation to 'es' language (#1439) ... glitch-soc-specific translation to 'es' language	2020-10-19 22:17:29 +02:00