about summary refs log tree commit diff
path: root/config/webpack
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-12 13:28:03 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-12 13:28:03 +0100
commit93912f04988eab072a119a588342c68c5cdb52e0 (patch)
tree815a69053ed9f1eb5e86e62735220a53bfcef814 /config/webpack
parentd37f426f95f812b44925e13c00eabb9d1cd76b1f (diff)
parentd26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
Diffstat (limited to 'config/webpack')
0 files changed, 0 insertions, 0 deletions