Skip to content

Commit

Permalink
Merge branch 'dev' into fix-jumbatron-html-props
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobmllr95 committed May 15, 2020
2 parents abedd27 + a5df131 commit 09d5f75
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -149,7 +149,7 @@
"postcss-cli": "^7.1.1",
"prettier": "1.14.3",
"require-context": "^1.1.0",
"rollup": "^2.10.0",
"rollup": "^2.10.1",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -11296,10 +11296,10 @@ rollup-pluginutils@^2.8.1:
dependencies:
estree-walker "^0.6.1"

rollup@^2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.10.0.tgz#73332273fa177cd85c1042659dee6f103761be0d"
integrity sha512-7BmpEfUN9P6esJzWIn3DmR//90mW6YwYB1t3y48LpF8ITpYtL8s1kEirMKqUu44dVH/6a/rs0EuwYVL3FuRDoA==
rollup@^2.10.1:
version "2.10.1"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.10.1.tgz#18a97703f0cb6e3a1711a3e4db42021d5290cecc"
integrity sha512-d7e9QM49YAnFjqxTm4HbzDMLX6KeTKEd7UY7uCqP/uVCviXEjyl4e/sGfulTIgvZHVYFS4jXhr+Qugp+WPHkYQ==
optionalDependencies:
fsevents "~2.1.2"

Expand Down

0 comments on commit 09d5f75

Please sign in to comment.