mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-12-10 14:48:47 +00:00
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||