Conflicts: - `app/serializers/rest/status_serializer.rb`: Not a real conflict, just glitch-soc code textually adjacent to code added upstream.
Conflicts: - `app/serializers/rest/status_serializer.rb`: Not a real conflict, just glitch-soc code textually adjacent to code added upstream.