Glitch-Shrike/app/javascript
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
2023-09-15 21:43:49 +02:00
..
core Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
flavours [Glitch] Fix notification permissions being requested immediately after login 2023-09-15 21:33:28 +02:00
fonts
hooks
icons
images
mastodon Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
packs Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
skins
styles Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
types