mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-14 22:53:53 -05:00
Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.