Claire 7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.		2023-07-30 13:42:06 +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 '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
tests.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00