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		2023-08-11 22:15:41 +02:00
..
babel.js
css.js
file.js
index.js	Change design of role badges in web UI (#26281)	2023-08-02 17:24:32 +02:00
mark.js
material_icons.js	Change design of role badges in web UI (#26281)	2023-08-02 17:24:32 +02:00
node_modules.js
tesseract.js