Merge branch 'dev' into feat/icons

tmorehouse · web-flow · commit b1381016d29d · 2019-12-15T00:07:03.000-04:00
diff --git a/package.json b/package.json
@@ -130,7 +130,7 @@
     "postcss-cli": "^6.1.3",
     "prettier": "1.14.3",
     "require-context": "^1.1.0",
-    "rollup": "^1.27.12",
+    "rollup": "^1.27.13",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
diff --git a/src/components/toast/README.md b/src/components/toast/README.md
@@ -485,7 +485,7 @@ for generating more complex toast content:
 ## Alerts versus toasts
 
 In some cases you may need just a simple alert style message (i.e. cookie usage notifications,
-etc.). In these cases is is usually better to use an fixed position alert instead of a toast, by
+etc.). In these cases it is usually better to use an fixed position alert instead of a toast, by
 applying a few Bootstrap [utility classes](/docs/reference/utility-classes) and a small bit of
 custom styling on a [`<b-alert>`](/docs/components/alert) component:
 
diff --git a/yarn.lock b/yarn.lock
@@ -10498,10 +10498,10 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^1.27.12:
-  version "1.27.12"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.12.tgz#cf84db4b4edaf187eaba95232f34de7cd4d22d9c"
-  integrity sha512-51iR7n6NQfdQJlRrIktaGmkdt395A8Vue7CdnlrK6UhY9DY2GaKsTdljWeXisJuZh+w90Gz8VFNh5X+yxP20oQ==
+rollup@^1.27.13:
+  version "1.27.13"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.13.tgz#d6d3500512daacbf8de54d2800de62d893085b90"
+  integrity sha512-hDi7M07MpmNSDE8YVwGVFA8L7n8jTLJ4lG65nMAijAyqBe//rtu4JdxjUBE7JqXfdpqxqDTbCDys9WcqdpsQvw==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"
