Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
mastodon-light	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	2019-09-29 21:46:05 +02:00
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…