From: mtmail <mtmail@gmx.net>
Date: Sat, 30 Nov 2019 13:57:32 +0000 (+0100)
Subject: Merge pull request #2 from mtmail/dependabot/npm_and_yarn/bootstrap-3.4.1
X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/commitdiff_plain/6638f08e4f455405690910627c36dea591aa5f38?hp=-c

Merge pull request #2 from mtmail/dependabot/npm_and_yarn/bootstrap-3.4.1

Bump bootstrap from 3.3.5 to 3.4.1
---

6638f08e4f455405690910627c36dea591aa5f38
diff --combined package.json
index c147c89,61521ae..5634f79
--- a/package.json
+++ b/package.json
@@@ -11,11 -11,11 +11,11 @@@
    "devDependencies": {
      "grunt": "^1.0.2",
      "bower": "^1.8",
 -    "jquery": "3.3.1",
 +    "jquery": "3.4.0",
      "leaflet": "1.3.1",
      "leaflet-minimap": "3.6.1",
      "handlebars": "4.0.11",
-     "bootstrap": "3.3.5",
+     "bootstrap": "3.4.1",
      "@ungap/url-search-params": "0.1.4"
    }
  }
diff --combined yarn.lock
index d1d33d2,0c8141a..1f633d2
--- a/yarn.lock
+++ b/yarn.lock
@@@ -55,10 -55,10 +55,10 @@@ balanced-match@^1.0.0
    resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
    integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
  
- bootstrap@3.3.5:
-   version "3.3.5"
-   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.5.tgz#1777ab79299b128d87dce7cbd86fdc46ac69c0b1"
-   integrity sha1-F3ereSmbEo2H3OfL2G/cRqxpwLE=
+ bootstrap@3.4.1:
+   version "3.4.1"
+   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
+   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
  
  bower@^1.8:
    version "1.8.8"
@@@ -410,10 -410,10 +410,10 @@@ isexe@^2.0.0
    resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
    integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
  
 -jquery@3.3.1:
 -  version "3.3.1"
 -  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 -  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 +jquery@3.4.0:
 +  version "3.4.0"
 +  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
 +  integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
  
  js-yaml@~3.13.0:
    version "3.13.1"