mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-05 22:45:37 +00:00
42a0898f16
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here. |
||
---|---|---|
.. | ||
index.js |