Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
mastodon-light	Update light theme (#8392)	2018-08-23 19:20:49 +02:00
application.scss	…
contrast.scss	…
mailer.scss	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02:00
mastodon-light.scss	…
win95.scss	…