Thibaut Girka acbed64f3d 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
..
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00