You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' 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		1 year ago
..
babel.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	1 year ago
css.js	Fix build with new sass-loader	5 years ago
file.js	Enforce import order with ESLint (#25096)	2 years ago
index.js	Change design of role badges in web UI (#26281)	1 year ago
mark.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
material_icons.js	Change design of role badges in web UI (#26281)	1 year ago
node_modules.js	Enforce import order with ESLint (#25096)	2 years ago
tesseract.js	Update Tesseract.js (#14708)	4 years ago