David Yip 201e82686f

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -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-17 18:37:09 -06:00

application.scss

Show mastodon on modal (#6129)

2018-01-02 05:07:56 +01:00

mailer.scss

Use better reblog icon and improve contrast in HTML e-mails (#6272)

2018-01-17 14:12:59 +01:00

win95.scss

Skins support

2017-11-30 19:29:47 -08:00