Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02:00
..
activitypub	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
nodeinfo	…
rest	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-22 10:06:11 +02:00
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…