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 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		7 years ago
..
fonts	Font styles are now packagified	7 years ago
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	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	Skins support	7 years ago