luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-30 00:56:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
2022-03-02 20:48:27 +01:00
..
contrast
fonts Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
mastodon-light Fixing the hero widget (#15926) 2021-03-19 20:23:32 +01:00
application.scss
contrast.scss
mailer.scss Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
mastodon-light.scss
win95.scss