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

Handle nil and blank cases in Account finders (#3500)

2017-06-01 08:20:36 -04:00

account_interactions_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-10 21:10:09 +01:00

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

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +02:00