David Yip f61aa8e0f7

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb

2018-03-27 10:26:47 -05:00

..

fonts

Font styles are now packagified

2017-11-18 11:05:00 -08:00

mastodon

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:26:47 -05:00

application.scss

Replace drawer elephant graphic with a vector image (#6286)

2018-01-19 15:25:27 +01:00

mailer.scss

Improve HTML e-mails based on Litmus tests (#6301)

2018-01-20 01:32:21 +01:00

win95.scss

Strip trailing whitespace on win95.scss

2018-01-18 10:54:50 -06:00