Merge remote-tracking branch 'upstream/pull/1892'
authorTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
commitba9a00b10cc8a075a5a4090a1601e3d3b72b2ec1
tree0bff9085a1220e7250ec1b3fd991ec18e508bfb8
parentbeec16232df29300ebd18947b3ef54fa4c2adcdd
parent57d3b3af55a0bb37eb964aa75a9f1549df9a771c
Merge remote-tracking branch 'upstream/pull/1892'
.rubocop_todo.yml
config/routes.rb