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 759226e116 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
..
chewy	Add trending links (#16917)	3 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mailers	Add trending links (#16917)	3 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago