mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 13:04:59 +00:00
1b0ff4cd69
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb |
||
---|---|---|
.. | ||
exports | ||
preferences | ||
two_factor_authentication | ||
applications_controller.rb | ||
base_controller.rb | ||
deletes_controller.rb | ||
exports_controller.rb | ||
featured_tags_controller.rb | ||
flavours_controller.rb | ||
identity_proofs_controller.rb | ||
imports_controller.rb | ||
migrations_controller.rb | ||
preferences_controller.rb | ||
profiles_controller.rb | ||
sessions_controller.rb | ||
two_factor_authentications_controller.rb |