Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
mastodon-light
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss