Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		2019-02-01 16:12:20 +01:00
..
contrast	Fix link color in high-contrast theme, add underlines (#9949)	2019-02-01 00:15:38 +01:00
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-25 11:37:49 +01:00
mastodon-light	…
application.scss	Add new first-time tutorial (#9531)	2018-12-17 11:07:17 +01:00
contrast.scss	…
mailer.scss	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
mastodon-light.scss	…
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00