Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
mastodon-light	Fix more visual issues with the audio player (#11654)	2019-08-25 15:09:19 +02:00
application.scss
contrast.scss
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss
win95.scss