741766a01d
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |
741766a01d
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |