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 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
exports	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
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_spec.rb	…
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
exports_controller_spec.rb	…
flavours_controller_spec.rb	…
identity_proofs_controller_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
imports_controller_spec.rb	…
migrations_controller_spec.rb	…
profiles_controller_spec.rb	…
sessions_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	…