Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
contrast	…
fonts	…
mastodon	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
mastodon-light	Fix language and emoji search field background colors on light theme (#29828)	2024-04-03 14:22:50 +00:00
application.scss	…
contrast.scss	…
inert.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…