Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
account_finder_concern_spec.rb
account_interactions_spec.rb
remotable_spec.rb	Fix remote files not using Content-Type header, streaming (#14184)	2020-06-30 23:58:02 +02:00
status_threading_concern_spec.rb