Merge remote-tracking branch 'openstreetmap/pull/1367'
authorTom Hughes <tom@compton.nu>
Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)
commit970e1a99d7dce64f0631e88c5b9f060fb48d75fe
tree168c26f9a221f479ac55c9fdc2829f50e84e03ca
parentf75e41eac3c0e8a860c369a19e6c51392a61d010
parent898c1475baaac883442fdf32d16379f1b737052c
Merge remote-tracking branch 'openstreetmap/pull/1367'
.rubocop_todo.yml
test/controllers/changeset_controller_test.rb
test/test_helper.rb