mastodon/public
Claire 2a7538aeed 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 Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
headers/original
ocr/lang-data
sounds
500.html
background-cybre.png
badge.png Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
clock.js
embed.js fix: embed.js doesn't expands iframes height (#18301) 2022-05-04 03:20:44 +02:00
favicon.ico Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
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) 2022-08-25 20:10:01 +02:00
sw.js.map Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png