mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-11 14:03:25 +00:00
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |