mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-12 05:07:06 +00:00
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
---|---|---|
.. | ||
account_relationships_presenter_spec.rb | ||
instance_presenter_spec.rb |