David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss		2018-01-19 15:22:10 -06:00
..
fonts	Font styles are now packagified	2017-11-18 11:05:00 -08:00
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-19 15:22:10 -06:00
application.scss	Replace drawer elephant graphic with a vector image (#6286)	2018-01-19 15:25:27 +01:00
mailer.scss	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
win95.scss	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00