mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-20 23:37:34 +02:00
04534604c6
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
delete_confirmation.rb | ||
migration.rb | ||
status_batch.rb | ||
two_factor_confirmation.rb |