Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-19 23:52:48 +01:00
nodeinfo	…
rest	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +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	…