mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 12:19:27 +00:00
61ef81c548
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 |