mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-12-10 06:18:19 +00:00
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||