mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-12 05:33:49 -05:00
Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.