mastodon/app/javascript/styles
Claire e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
2023-09-15 21:25:05 +02:00
..
contrast Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
fonts Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00
mastodon Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
mastodon-light Fix light theme select option for hashtags (#26311) 2023-08-04 09:41:17 +02:00
application.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
mastodon-light.scss
win95.scss