about summary refs log tree commit diff
path: root/public
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-14 22:34:09 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-01-14 22:34:09 +0100
commitab59743c131574076af7fa3640493a866c4528ad (patch)
treec06274b2eaaf6fdb6d1ffb8c2d0ff6b94befdf6b /public
parentafd0d424da4928b9e20a3c7a943f970252ed3a29 (diff)
parentd66dfc7b3c1b62a0d5276387ea8745da598afacc (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions