tykayn d96d645e0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # yarn.lock		2021-01-13 14:45:58 +01:00
..
bliss	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
custom	fix mess footer	2020-02-01 17:29:30 +01:00
default	fix mess footer	2020-02-01 17:29:30 +01:00
fonts	Use correct local names for fonts (#10594)	2019-04-21 04:42:02 +02:00
mastodon	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
mastodon-light	Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020	2020-12-24 16:38:36 +01:00
application.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
bliss.scss	custom style	2020-11-01 10:42:32 +01:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
custom.scss	hop	2020-02-01 17:43:33 +01:00
large_center.scss	hop	2020-02-01 17:43:33 +01:00
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	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00