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	…
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…