mastodon/public
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +02:00
..
avatars/original
emoji Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
headers/original
ocr/lang-data
shortcuts
sounds
500.html
android-chrome-192x192.png
apple-touch-icon.png
background-cybre.png
badge.png
browserconfig.xml
clock.js
embed.js Fixed prototype pollution bug and only allow trusted origin (#17420) 2022-02-01 17:34:48 +01:00
favicon-dev.ico
favicon.ico
inert.css
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
oops.gif
oops.png
riot-glitch.png
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png