Skip to content

Commit

Permalink
Merge branch 'master' into fix-1270001-protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
nougad committed Nov 20, 2019
2 parents 8b0ef4a + 3fbda40 commit 4925b22
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 53 deletions.
139 changes: 88 additions & 51 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -97,11 +97,11 @@
"jquery": "^3.4.1",
"less": "^3.10.3",
"less-loader": "^5.0.0",
"lint-staged": "^9.4.2",
"lint-staged": "^9.4.3",
"marked": "^0.7.0",
"memfs": "^2.16.1",
"npm-run-all": "^4.1.5",
"prettier": "^1.18.2",
"prettier": "^1.19.1",
"puppeteer": "^1.20.0",
"rimraf": "^3.0.0",
"standard-version": "^7.0.1",
Expand Down

0 comments on commit 4925b22

Please sign in to comment.