Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
avatars/original	…
emoji	Add new emojis from `jdecked/twemoji` 15.0 (#28404)	2024-01-11 16:15:08 +00:00
headers/original	…
ocr/lang-data	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
sounds	…
500.html	…
background-cybre.png	…
badge.png	…
clock.js	…
embed.js	…
favicon.ico	…
inert.css	…
logo-cybre-glitch.gif	…
oops.gif	…
oops.png	…
riot-glitch.png	…
robots.txt	…
sw.js	…
sw.js.map	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…