mastodon/public
Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
2024-01-15 20:01:36 +01: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 Embed js height fix (#22141) 2022-12-15 16:18:59 +01:00
favicon.ico
logo-cybre-glitch.gif
oops.gif
oops.png
riot-glitch.png
robots.txt Change: Block GPTBot (#26396) 2023-08-09 11:58:46 +02:00
sw.js
sw.js.map
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png