mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-12-08 13:29:18 +00:00
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. |
||
|---|---|---|
| .. | ||
| index.js | ||
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. |
||
|---|---|---|
| .. | ||
| index.js | ||