This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... 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		2019-06-10 18:59:53 +02:00
..
exports	…
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
profiles_controller.rb	…
sessions_controller.rb	…
two_factor_authentications_controller.rb	…