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.		2022-08-28 11:31:00 +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
sw.js
sw.js.map
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png