Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.		2022-01-16 18:11:20 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
nodeinfo	…
rest	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01: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	…