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

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.

2022-02-10 19:09:27 +01:00

..

core

[Glitch] Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 21:45:01 +02:00

flavours

[Glitch] Add edit history to web UI

2022-02-09 17:51:35 +01:00

fonts

Theme: Windows 95

2018-01-05 16:22:58 -08:00

images

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

2020-05-13 22:11:49 +02:00

locales

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

2018-12-01 21:00:16 +01:00

mastodon

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

2022-02-10 19:09:27 +01:00

packs

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

2021-12-16 16:20:44 +01:00

skins

Glitchsoc translation to 'es' language (#1439)

2020-10-19 22:17:29 +02:00

styles

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

2022-02-09 17:28:33 +01:00