From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Aug 2020 08:09:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2756'
X-Git-Tag: live~2981
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2e2bcc6991a925c04598de2626ce572595bdd12b?ds=sidebyside

Merge remote-tracking branch 'upstream/pull/2756'
---

2e2bcc6991a925c04598de2626ce572595bdd12b
diff --cc package.json
index a17d41b64,27d2ff070..7e12125bc
--- a/package.json
+++ b/package.json
@@@ -7,8 -7,8 +7,8 @@@
      "jquery-simulate": "^1.0.2",
      "jquery.cookie": "^1.4.1",
      "leaflet": "^1.6.0",
 -    "leaflet.locatecontrol": "^0.71.1",
 +    "leaflet.locatecontrol": "^0.72.0",
-     "ohauth": "^0.2.2",
+     "ohauth": "^1.0.0",
      "qs": "^6.9.4"
    },
    "devDependencies": {