Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
contrast	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
fonts
mastodon	Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream	2023-07-12 15:54:58 +02:00
mastodon-light	fix buttons showing inconsistent styles (#25903)	2023-07-11 12:26:09 +02:00
application.scss
contrast.scss
mailer.scss	Update Stylelint (#25819)	2023-07-12 12:31:23 +02:00
mastodon-light.scss
win95.scss