Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.		2024-04-06 21:01:40 +02:00
..
activitypub	…
node_info	…
rest	…
web	…
initial_state_serializer.rb	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…