mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
fcce135d27
Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting. |
||
---|---|---|
.. | ||
_login.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |