monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 		2025-01-14 20:38:32 +01:00
..
contrast
…
fonts
…
mastodon Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 2025-01-14 20:38:32 +01:00
mastodon-light Fix various visual sign-up flow issues (#33206) 2024-12-09 08:23:19 +00:00
application.scss Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
contrast.scss
…
inert.scss
…
mailer.scss Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
mastodon-light.scss
…
win95.scss
…