]> git.openstreetmap.org Git - nominatim-ui.git/commitdiff
Merge branch 'master' into dependabot/npm_and_yarn/handlebars-4.1.2
authormtmail <mtmail@gmx.net>
Sat, 30 Nov 2019 13:58:20 +0000 (14:58 +0100)
committerGitHub <noreply@github.com>
Sat, 30 Nov 2019 13:58:20 +0000 (14:58 +0100)
1  2 
package.json
yarn.lock

diff --cc package.json
index 059225409ed5e253f56da1708eff2aa53b5262d3,5634f79c0e9582ec4d8d329000fb99ea7cb22ebe..982e52db4304e53d30974d6deef0afb2590a0936
@@@ -14,8 -14,8 +14,8 @@@
      "jquery": "3.4.0",
      "leaflet": "1.3.1",
      "leaflet-minimap": "3.6.1",
 -    "handlebars": "4.0.11",
 +    "handlebars": "4.1.2",
-     "bootstrap": "3.3.5",
+     "bootstrap": "3.4.1",
      "@ungap/url-search-params": "0.1.4"
    }
  }
diff --cc yarn.lock
Simple merge