mastodon/config/webpack
Claire 2a7538aeed 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.
2022-08-28 11:31:00 +02:00
..
rules Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
configuration.js Refactor compile-time glitch-soc theme handling 2022-02-11 23:49:00 +01:00
development.js Bump webpack-merge from 4.2.2 to 5.0.9 (#14424) 2020-11-05 02:21:28 +09:00
generateLocalePacks.js
production.js Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
shared.js Merge branch 'main' into glitch-soc/merge-upstream 2022-04-04 17:25:57 +02:00
tests.js Bump jest from 26.6.3 to 27.1.0 (#16376) 2021-08-28 09:58:04 +09:00
translationRunner.js Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00