0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-07 13:07:13 +00:00
mastodon/app/javascript/styles
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
contrast
fonts Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
mastodon-light Change "direct message" nomenclature to "private mention" in web UI () 2023-03-30 15:16:20 +02:00
application.scss Add support for incoming rich text () 2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss