mirror of https://github.com/tootsuite/mastodon
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 | ||