mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
42a0898f16
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 |