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 /.env.vagrant | |
| 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 '.env.vagrant')
0 files changed, 0 insertions, 0 deletions