Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
avatars/original	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
emoji	Add assets from Twemoji 14.0 (#19733)	2022-11-04 16:08:41 +01:00
headers/original	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
ocr/lang-data
sounds
500.html
background-cybre.png
badge.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01: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	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	2020-05-08 21:22:57 +02:00
logo-cybre-glitch.gif
oops.gif
oops.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
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	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
web-push-icon_favourite.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
web-push-icon_reblog.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00