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

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

components

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

2022-03-22 17:00:38 +01:00

containers

Fix controls for unchangeable properties on status edit not being disabled (#17531)

2022-02-12 19:00:33 +01:00

util

Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)

2021-03-02 12:02:56 +01:00

index.js

Fix drawer tab menu routes in advanced web ui (#16793)

2021-09-30 05:19:08 +02:00