mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-11-13 11:25:35 +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 | ||