Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
mastodon-light	Update light theme (#8392)	2018-08-23 19:20:49 +02:00
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…