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.
catstodon/public
Jeremy Kescher 48373a71e3
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/components/status_action_bar.js
#	app/javascript/flavours/glitch/containers/status_container.js
#	app/javascript/flavours/glitch/features/status/components/action_bar.js
#	app/javascript/flavours/glitch/locales/de.json
#	app/javascript/flavours/glitch/locales/fr.json
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/features/status/components/action_bar.js
#	config/locales-glitch/de.yml
#	config/locales-glitch/fr.yml
#	config/locales-glitch/simple_form.de.yml
#	config/locales-glitch/simple_form.fr.yml
1 year 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 Change sound effects 2 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
blobCat.png Make the emoji picker blob cat a static asset 2 years ago
clock.js cybrespace to 1.4.2 7 years ago
embed.js Embed js height fix (#22141) 1 year ago
favicon.ico Fix wrong aspect ratio of logo in icons (#18639) 2 years ago
inert.css Expand Stylelint glob to include CSS files (#22469) 1 year 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