You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2 years ago
..
avatars/original	…
emoji	Fix light-mode emoji borders. (#18131)	3 years ago
headers/original	…
ocr/lang-data	…
sounds	…
500.html	…
background-cybre.png	…
badge.png	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
clock.js	…
embed.js	fix: embed.js doesn't expands iframes height (#18301)	2 years ago
favicon.ico	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
inert.css	…
logo-cybre-glitch.gif	…
oops.gif	…
oops.png	…
riot-glitch.png	…
robots.txt	…
sw.js	Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)	2 years ago
sw.js.map	Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)	2 years ago
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…