Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.		2024-09-12 20:05:08 +02:00
..
avatars/original
emoji	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +00:00
headers/original
ocr/lang-data
sounds
500.html
background-cybre.png
badge.png
clock.js
embed.js	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00: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