about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-11 09:37:48 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-11 09:37:48 +0200
commit5fd8780b1429acd2bea908695e13c41375d189d7 (patch)
treec870d368c2a9d0bfd2176057c0b99dad48338248 /app/javascript/flavours/glitch
parente8b8ac8908c6623f0fd7ffccc7de3882a773b72f (diff)
parent95555f15b55291b97477465f8d8a7eba526d6522 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
Diffstat (limited to 'app/javascript/flavours/glitch')
0 files changed, 0 insertions, 0 deletions