You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
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	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	5 years ago
imports_controller_spec.rb	…
migrations_controller_spec.rb	…
profiles_controller_spec.rb	…
sessions_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	…