luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 04:13:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config/webpack
History
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
rules Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
configuration.js Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' 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
production.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
shared.js Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
tests.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00