Skip to content

Commit

Permalink
Merge branch 'master' into master-ysds-addition-subtraction-func
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Sep 5, 2019
2 parents 0ad3799 + c6a82fc commit 35f1984
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 77 deletions.
169 changes: 99 additions & 70 deletions package-lock.json

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

14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -108,18 +108,18 @@
"bundlesize": "^0.18.0",
"clean-css-cli": "^4.3.0",
"coveralls": "^3.0.6",
"cross-env": "^5.2.0",
"eslint": "^6.2.2",
"cross-env": "^5.2.1",
"eslint": "^6.3.0",
"eslint-config-xo": "^0.26.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-unicorn": "^10.0.0",
"find-unused-sass-variables": "^0.5.0",
"glob": "^7.1.4",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.45.2",
"hugo-bin": "^0.46.0",
"ip": "^1.1.5",
"jasmine-core": "^3.4.0",
"karma": "^4.2.0",
"karma": "^4.3.0",
"karma-browserstack-launcher": "1.4.0",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
Expand All @@ -130,11 +130,11 @@
"karma-rollup-preprocessor": "^7.0.2",
"linkinator": "^1.5.0",
"node-sass": "^4.12.0",
"nodemon": "^1.19.1",
"nodemon": "^1.19.2",
"npm-run-all": "^4.1.5",
"popper.js": "^1.15.0",
"postcss-cli": "^6.1.3",
"rollup": "^1.20.2",
"rollup": "^1.20.3",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-istanbul": "^2.0.1",
"rollup-plugin-node-resolve": "^5.2.0",
Expand All @@ -144,7 +144,7 @@
"stylelint": "^10.1.0",
"stylelint-config-twbs-bootstrap": "^0.4.0",
"terser": "^4.2.1",
"vnu-jar": "19.6.7"
"vnu-jar": "19.9.4"
},
"engines": {
"node": ">=8"
Expand Down

0 comments on commit 35f1984

Please sign in to comment.