mastodon/app/javascript
Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
2023-07-30 13:49:35 +02:00
..
core
flavours [Glitch] Fix a missing redirection on getting-started in multi column mode 2023-07-30 13:32:16 +02:00
fonts
hooks
icons
images
mastodon Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 2023-07-30 13:49:35 +02:00
packs
skins
styles Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 2023-07-30 13:49:35 +02:00
types