Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.		2020-12-19 00:55:12 +01:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +01:00
mastodon-light	Fix styles for RTL languages and the light theme (#15356)	2020-12-18 08:47:36 +01:00
application.scss
contrast.scss
mailer.scss	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00
mastodon-light.scss
win95.scss