Skip to content

Commit

Permalink
Merge branch 'master' into master-mc-add-funding
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Nov 7, 2019
2 parents f82924b + cc8ac09 commit 89721ef
Show file tree
Hide file tree
Showing 2 changed files with 245 additions and 41 deletions.
280 changes: 242 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -87,8 +87,8 @@
"popper.js": "^1.16.0"
},
"devDependencies": {
"@babel/cli": "^7.6.4",
"@babel/core": "^7.6.4",
"@babel/cli": "^7.7.0",
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
"@babel/preset-env": "^7.6.3",
"autoprefixer": "^9.7.1",
Expand All @@ -103,7 +103,7 @@
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-unicorn": "^12.1.0",
"find-unused-sass-variables": "^1.0.2",
"glob": "^7.1.5",
"glob": "^7.1.6",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.47.1",
"ip": "^1.1.5",
Expand Down

0 comments on commit 89721ef

Please sign in to comment.