mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-10 17:02:11 -05:00
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.