Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		2018-05-27 13:20:15 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
mastodon-light	Fix color mistakes in mastodon-light theme (#7626)	2018-05-26 10:53:44 +02:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss