Merge remote-tracking branch 'upstream/pull/1704'
authorTom Hughes <tom@compton.nu>
Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)
1  2 
.rubocop_todo.yml
app/controllers/changeset_controller.rb
test/controllers/changeset_controller_test.rb

Simple merge