This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/styles
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.
2019-10-03 11:10:12 +02:00
..
contrast
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
mastodon-light Fix media editing modal and profile directory in light theme (#12059) 2019-10-03 03:17:29 +02:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss