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 a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.		5 years ago
..
contrast	…
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 media editing modal and profile directory in light theme (#12059)	5 years ago
application.scss	…
contrast.scss	…
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
mastodon-light.scss	…
win95.scss	…