David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		2018-06-07 05:13:49 -05:00
..
contrast	…
fonts	…
mastodon	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
mastodon-light	Change border color of activity-stream (#7724)	2018-06-04 13:13:31 +02:00
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…