mastodon/app/javascript/styles
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
contrast
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
mastodon-light Update light theme (#8392) 2018-08-23 19:20:49 +02:00
application.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
contrast.scss
mailer.scss
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss