Commit dc236376 authored by micah's avatar micah

Merge branch 'upgrade-rails' into 'master'

upgrade: rails 4.2.11.1

See merge request riseup/helpy!4
parents 17427f26 c710f2cb
Pipeline #24080 failed with stage
in 35 seconds