Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js`		2022-05-04 19:15:50 +02:00
..
avatars/original
emoji
headers/original
ocr/lang-data
shortcuts
sounds
500.html
android-chrome-192x192.png
apple-touch-icon.png
background-cybre.png
badge.png
browserconfig.xml
clock.js
embed.js
favicon-dev.ico
favicon.ico
inert.css
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
oops.gif
oops.png
riot-glitch.png
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png