about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-10-25 20:28:51 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-10-25 20:28:51 +0200
commite855df149bd2f19729af48cd5f452fa3972273f8 (patch)
tree4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /app/views
parentc647fa99cab9b9db81d36223cf2c2c27e065b648 (diff)
parent5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
Diffstat (limited to 'app/views')
0 files changed, 0 insertions, 0 deletions