mirror of
https://github.com/mastodon/mastodon.git
synced 2025-03-14 13:44:55 +01:00
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies. |
||
---|---|---|
.. | ||
index.js |