mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-21 08:17:32 +02:00
aaec64a500
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |