mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 00:54:02 -05:00
876aa35350
Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
inert.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |