Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
avatars/original	…
emoji	Add assets from Twemoji 14.0 (#19733)	2022-11-04 16:08:41 +01:00
headers/original	…
ocr/lang-data	…
sounds	…
500.html	…
background-cybre.png	…
badge.png	…
clock.js	…
embed.js	Embed js height fix (#22141)	2022-12-15 16:18:59 +01:00
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	…