Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.

2022-01-23 18:24:01 +01:00

..

_status.html.haml

Add post edited notice in admin and public UIs (#17335)

2022-01-20 13:37:31 +01:00

index.html.haml

Add ability to filter reports by origin of target account (#16487)

2021-07-11 11:01:38 +02:00

show.html.haml

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

2022-01-17 10:45:25 +01:00