diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-28 11:26:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-08-28 11:31:00 +0200 |
| commit | 077183a12128cf9dbc2cbbdbffbf49250e9b38df (patch) | |
| tree | 7aed6cae7382ac413b0f93e7523552307fe6938d /public | |
| parent | 54d9a9c18a74a1ec766d8f611ad3ee11ab4c5422 (diff) | |
| parent | 2a7766dcc958ad18df761de50f9da5164f1a2e8f (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.
Diffstat (limited to 'public')
| l--------- | public/sw.js | 2 | ||||
| l--------- | public/sw.js.map | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/public/sw.js b/public/sw.js index 1471a9e64..debb9af9d 120000 --- a/public/sw.js +++ b/public/sw.js @@ -1 +1 @@ -assets/sw.js \ No newline at end of file +packs/sw.js \ No newline at end of file diff --git a/public/sw.js.map b/public/sw.js.map new file mode 120000 index 000000000..0734c8199 --- /dev/null +++ b/public/sw.js.map @@ -0,0 +1 @@ +packs/sw.js.map \ No newline at end of file |