mastodon/config/webpack
Claire fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
..
rules Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
configuration.js Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
development.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
generateLocalePacks.js Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
production.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
shared.js Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
tests.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
translationRunner.js Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00