Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.		2023-08-13 18:47:15 +02:00
..
avatars/original	…
emoji	…
headers/original	…
ocr/lang-data	…
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	Change: Block GPTBot (#26396)	2023-08-09 11:58:46 +02:00
sw.js	…
sw.js.map	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…