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 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		3 years ago
..
chewy	Change `tootctl search deploy` algorithm (#14300)	4 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	Prepare Mastodon for Rails 6 (#15911)	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