mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-13 11:13:05 -05:00
4aa78027ea
Conflicts: - `Gemfile.lock`: upstream-updated dependency (redis) textually too close to glitch-specific one (redcarpet). Ported upstream change.