David Yip d3f64812a6

Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update ...

Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml

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

..

fonts

Font styles are now packagified

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

mastodon

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00: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

Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update

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