Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.
capture_emails
RSpec/LetSetup
spec/controllers
RSpec/DescribedClass
models/announcement
RSpec/InstanceVariable
RSpec/MultipleExpectations
controllers/statuses