Claire 32faa7213f Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README		2023-08-11 22:15:41 +02:00
..
babel.js	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
css.js	Fix build with new sass-loader	2019-11-07 14:56:09 +01:00
file.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.js	Change design of role badges in web UI (#26281)	2023-08-02 17:24:32 +02:00
mark.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
material_icons.js	Change design of role badges in web UI (#26281)	2023-08-02 17:24:32 +02:00
node_modules.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
tesseract.js	Update Tesseract.js (#14708)	2020-09-01 00:26:10 +02:00