Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.		2023-08-13 18:47:15 +02:00
..
activitypub	…
nodeinfo	…
rest	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main	2023-08-13 18:47:15 +02:00
web	…
initial_state_serializer.rb	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main	2023-08-13 18:47:15 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…