mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 04:55:05 +00: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 |
||
---|---|---|
.. | ||
exports | ||
preferences | ||
two_factor_authentication | ||
applications_controller_spec.rb | ||
deletes_controller_spec.rb | ||
exports_controller_spec.rb | ||
flavours_controller_spec.rb | ||
identity_proofs_controller_spec.rb | ||
imports_controller_spec.rb | ||
migrations_controller_spec.rb | ||
profiles_controller_spec.rb | ||
sessions_controller_spec.rb | ||
two_factor_authentications_controller_spec.rb |