mirror of
https://github.com/mastodon/mastodon.git
synced 2026-01-12 17:06:49 +00:00
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||