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.

Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		4 years ago
..
avatars/original	add new avatar placeholder missing.png (#6728)	7 years ago
emoji	Add border around 🐞 emoji (#14712)	4 years ago
headers/original	Optimize public/headers/missing.png (#7084)	7 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	7 years ago
android-chrome-192x192.png	Crush PNGs to reduce overall size (#7954)	7 years ago
apple-touch-icon.png	Crush PNGs to reduce overall size (#7954)	7 years ago
background-cybre.png	…
badge.png	Crush PNGs to reduce overall size (#7954)	7 years ago
browserconfig.xml	…
clock.js	…
embed.js	…
favicon-dev.ico	…
favicon.ico	…
inert.css	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	5 years ago
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	Crush PNGs to reduce overall size (#7954)	7 years ago
oops.gif	New error page graphic. Other error page improvements (#5099)	7 years ago
oops.png	Change error graphic to hover-to-play (#10055)	6 years ago
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	6 years ago
sw.js	…
web-push-icon_expand.png	Crush PNGs to reduce overall size (#7954)	7 years ago
web-push-icon_favourite.png	Crush PNGs to reduce overall size (#7954)	7 years ago
web-push-icon_reblog.png	…