This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
aliases	…
applications	…
deletes	…
exports	Fix reference to non-existing translation in the exports page. (#15894)	2021-03-15 02:17:29 +01:00
featured_tags	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
flavours	…
imports	…
login_activities	Add full user agent in tooltips for login activities (#16428)	2021-06-23 16:42:23 +02:00
migration/redirects	…
migrations	…
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-20 16:14:45 +02:00
shared	…
two_factor_authentication	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
two_factor_authentication_methods	…