You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
_bio.html.haml	Remove Keybase integration (#17045)	3 years ago
_header.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
_moved.html.haml	Fix end-user-facing uses of inline CSS (#13438)	5 years ago
_og.html.haml	Fix various issues around OpenGraph representation of media (#14133)	4 years ago
show.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	3 years ago