mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![Thibaut Girka](/assets/img/avatar_default.png)
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.