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.		2021-10-14 21:44:57 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-17 10:30:34 +02:00
nodeinfo	…
rest	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
rss	…
web	…
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
manifest_serializer.rb	use relative path for `scope` (#16714)	2021-09-08 23:33:36 +02:00
oembed_serializer.rb	…
webfinger_serializer.rb	…