You cannot 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 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.		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	Add OCR tool to media editing modal (#11566)	5 years ago
sounds	Add artist, title, and date metadata to boop.{mp3,ogg} (#5531)	7 years ago
500.html	Fix error 500 page	6 years ago
background-cybre.png	All cybrespace changes through 5/28	7 years ago
badge.png	png optimization(loss less) (#19630)	2 years ago
clock.js	cybrespace to 1.4.2	7 years ago
embed.js	…
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)	4 years ago
logo-cybre-glitch.gif	All cybrespace changes through 5/28	7 years ago
oops.gif	New error page graphic. Other error page improvements (#5099)	7 years ago
oops.png	png optimization(loss less) (#19630)	2 years ago
riot-glitch.png	cybrespace to 1.4.2	7 years ago
robots.txt	Disallow robots from indexing /interact/ (#10666)	5 years ago
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