Merge branch '4.0'

# Conflicts: # package.json # yarn.lock
silverstripe · Mar 19, 2019 · ca2baf6 · ca2baf6
2 parents c0e6806 + 3adda45
commit ca2baf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/dnadesign/silverstripe-elemental#readme",
   "dependencies": {
     "apollo-client": "^2.3.1",
-    "bootstrap": "4.1.3",
+    "bootstrap": "^4.3.1",
     "classnames": "^2.2.5",
     "graphql": "^14.0.0",
     "graphql-tag": "^2.10.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1211,9 +1211,9 @@ boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-bootstrap@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+bootstrap@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
 
 boxen@^1.2.1:
   version "1.3.0"