about summary refs log tree commit diff
path: root/public/sw.js
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-02 20:48:27 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-03-02 20:48:27 +0100
commit8743b1ea40425a83cc72834e823320439fd2fa02 (patch)
tree0bdfaca0357df1326bd3efb2e1a8319e719a2047 /public/sw.js
parentd9e30efa5ecc87bc9be7b2e28baaf34bd01032f5 (diff)
parentc0c4b5718d8827fc59d5564c227e848547a2cb69 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
Diffstat (limited to 'public/sw.js')
0 files changed, 0 insertions, 0 deletions