You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 720cb01715 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.		6 years ago
..
contrast	Fix text colors (#7227)	7 years ago
fonts	Font styles are now packagified	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Improve style of notice/alert messages (#8973)	6 years ago
application.scss	Add new first-time tutorial (#9531)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Separate font-family into variable (#8763)	6 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Strip trailing whitespace on win95.scss	7 years ago