Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.		2023-10-25 12:14:24 +02:00
..
contrast	…
fonts	…
mastodon	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
mastodon-light	Fix light theme select option for hashtags (#26311)	2023-08-04 09:41:17 +02:00
application.scss	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…