mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 11:48:46 +00:00
1665b84285
Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. |
||
---|---|---|
.. | ||
about | ||
statuses |