Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
middleware	…
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…