Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ...

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.

2023-05-25 20:43:25 +02:00

..

actions

Fix incorrect post links in strikes when the account is remote (#23611)

2023-03-15 04:14:47 +01:00

_actions.html.haml

Add confirmation screen when handling reports (#22375)

2023-01-18 16:40:09 +01:00

_media_attachments.html.haml

Fix UI crash in moderation interface when opening the media modal (#24816)

2023-05-11 12:41:55 +02:00

_status.html.haml

Add ability to view previous edits of a status in admin UI (#19462)

2022-10-26 13:42:29 +02:00

index.html.haml

…

show.html.haml

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

2023-01-14 22:34:09 +01:00