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 1177694c3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		5 years ago
..
contrast	Fix sass-lint config (#10982)	6 years ago
fonts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mastodon-light	Fix more issues in the light theme (#10996)	6 years ago
application.scss	Add polls (#10111)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Fix sass-lint config (#10982)	6 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago