You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip d3f64812a6 Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update ... Conflicts: app/javascript/styles/win95.scss config/themes.yml		7 years ago
..
fonts	Font styles are now packagified	7 years ago
mastodon	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
application.scss	Show mastodon on modal (#6129)	7 years ago
mailer.scss	Use better reblog icon and improve contrast in HTML e-mails (#6272)	7 years ago
win95.scss	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update	7 years ago