Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
mastodon-light	Improve style of notice/alert messages (#8973)	2018-10-13 01:51:30 +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