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
..
controllers	…
fabricators	…
features	…
fixtures	…
helpers	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
mailers	…
models	…
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…