Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.