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.
memorial
NotificationMailer
forward_to_domains
POST /api/v1/reports
Naming/MemoizedInstanceVariableName
with_lock
with_redis_lock