Merge remote-tracking branch 'openstreetmap/pull/1347' into master
authorTom Hughes <tom@compton.nu>
Sun, 5 Feb 2017 15:56:04 +0000 (15:56 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Feb 2017 16:02:20 +0000 (16:02 +0000)
commit0814b4096c443e2ab3c09baa058aa81a00d205d1
tree009e13e2550abad5692822bea64516abc2095688
parenta28f264ad18605f6e95fde7aafe7217335831227
parent62346c7e88901df3ca21afc142cab00f6fb6ae38
Merge remote-tracking branch 'openstreetmap/pull/1347' into master
Gemfile
Gemfile.lock
test/controllers/amf_controller_test.rb
test/controllers/api_controller_test.rb
test/controllers/site_controller_test.rb
test/controllers/user_controller_test.rb
test/integration/oauth_test.rb
test/test_helper.rb