You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 20fb459dee 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.		2 years ago
..
avatars/original	png optimization(loss less) (#19630)	2 years ago
emoji	Add assets from Twemoji 14.0 (#19733)	2 years ago
headers/original	png optimization(loss less) (#19630)	2 years ago
ocr/lang-data	…
sounds	…
500.html	…
background-cybre.png	…
badge.png	png optimization(loss less) (#19630)	2 years ago
clock.js	…
embed.js	fix: embed.js doesn't expands iframes height (#18301)	3 years ago
favicon.ico	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
inert.css	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	5 years ago
logo-cybre-glitch.gif	…
oops.gif	…
oops.png	png optimization(loss less) (#19630)	2 years ago
riot-glitch.png	…
robots.txt	…
sw.js	Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)	2 years ago
sw.js.map	Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)	2 years ago
web-push-icon_expand.png	png optimization(loss less) (#19630)	2 years ago
web-push-icon_favourite.png	png optimization(loss less) (#19630)	2 years ago
web-push-icon_reblog.png	png optimization(loss less) (#19630)	2 years ago