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 aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
applications	…
deletes	…
exports	…
featured_tags	…
flavours	…
identity_proofs	…
imports	…
migrations	…
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
shared	…
two_factor_authentication	…
two_factor_authentications	…