about summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-12-16 16:19:28 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-12-16 16:20:44 +0100
commitb2526316f54839968c821295e63066beaa425159 (patch)
treeb13a52c19923edfb80518f82ac060f296e68aeb2 /.circleci
parentd911c17f521d6b13861caa886715a50b644007a1 (diff)
parent2aafa5b4e7a83ce8195cd739f1233a52ab060db7 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions