]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2756'
authorTom Hughes <tom@compton.nu>
Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 7 Aug 2020 08:09:07 +0000 (09:09 +0100)
1  2 
package.json
yarn.lock

diff --cc package.json
index a17d41b649c77bcadc3ebefab86c659b498f2b6b,27d2ff070d5c43b21e3f17065f92b163537129df..7e12125bc33e7a0fe9a5d433f69abfcdbc3d21a8
@@@ -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": {
diff --cc yarn.lock
Simple merge