]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2918' into master
authorTom Hughes <tom@compton.nu>
Wed, 28 Oct 2020 11:29:57 +0000 (11:29 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 28 Oct 2020 11:29:57 +0000 (11:29 +0000)
1  2 
.rubocop_todo.yml
test/controllers/api/old_nodes_controller_test.rb

Simple merge