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
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
nodeinfo	…
rest	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
rss	…
web	…
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
manifest_serializer.rb	use relative path for `scope` (#16714)	3 years ago
oembed_serializer.rb	…
webfinger_serializer.rb	…