kyori19 ae2190b9a5 Merge remote-tracking branch 'mastodon/main' into custom/quote ...

# Conflicts:
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/components/status_content.js
#	app/javascript/mastodon/containers/timeline_container.js
#	app/javascript/mastodon/features/status/components/detailed_status.js
#	app/javascript/styles/mastodon/components.scss

2022-11-15 01:48:20 +00:00

..

fonts

Change about page to be mounted in the web UI (#19345)

2022-10-13 14:42:37 +02:00

icons

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00

images

Add old logo files back (#20332)

2022-11-10 20:25:12 +01:00

mastodon

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

packs

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-05 19:56:50 +00:00

styles

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00