about summary refs log tree commit diff
path: root/app/javascript/locales
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-03 10:16:49 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-03 10:16:49 +0200
commit3869daef0937cf98f6a79f5c4543ee11724f37e8 (patch)
treed4b9c43975058d6e23eff874a9813a67125bbec3 /app/javascript/locales
parentcb9a919ff28294a2f1cf3642a165ad433cbf856b (diff)
parent7e244879feaa8de9894e1147ff49a7e762fe462a (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/locales')
0 files changed, 0 insertions, 0 deletions