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

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.

2022-03-15 20:45:27 +01:00

..

chewy

Change how changes to media attachments are stored for edits (#17696)

2022-03-09 09:06:17 +01:00

controllers

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

2022-03-15 20:45:27 +01:00

helpers

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

2022-03-12 11:51:25 +01:00

javascript

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

2022-03-15 20:45:27 +01:00

lib

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

2022-03-12 11:51:25 +01:00

mailers

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

models

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

2022-03-15 20:45:27 +01:00

policies

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

2022-03-08 20:22:54 +01:00

presenters

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

2022-03-08 20:22:54 +01:00

serializers

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

2022-03-10 09:52:45 +01:00

services

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

2022-03-12 20:20:58 +01:00

validators

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

2022-02-26 09:29:23 +01:00

views

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

2022-03-15 20:45:27 +01:00

workers

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

2022-03-10 09:52:45 +01:00