Claire 341b653578 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16: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	Expand Stylelint glob to include CSS files (#22469)	2023-01-05 13:42:13 +01:00
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	…