Claire e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Upstream removed some code that somehow had been modified in glitch-soc. Removed it as upstream did.		2025-03-24 20:06:25 +01:00
..
rules	Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream	2025-03-24 20:06:25 +01:00
configuration.js	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
development.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
production.js	Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395)	2025-03-05 17:05:15 +00:00
shared.js	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00