Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	package.json
#	yarn.lock
  • Loading branch information
prokopsimek committed Feb 3, 2020
2 parents 360d218 + 092b97e commit bf633a2
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 238 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## [2.0.3-beta.1](https://github.com/dxheroes/dx-scanner/compare/v2.0.2...v2.0.3-beta.1) (2020-02-02)

## [2.0.3](https://github.com/dxheroes/dx-scanner/compare/v2.0.2...v2.0.3) (2020-02-03)

### Bug Fixes

* **deps:** update all non-major dependencies ([046576a](https://github.com/dxheroes/dx-scanner/commit/046576a4e9bc0d5540570de4d1ac432837940047))

## [2.0.3-beta.1](https://github.com/dxheroes/dx-scanner/compare/v2.0.2...v2.0.3-beta.1) (2020-02-02)

### Bug Fixes

Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"dependencies": {
"@commitlint/config-conventional": "8.3.4",
"@commitlint/lint": "8.3.5",
"@octokit/rest": "16.37.0",
"@types/eslint": "6.1.3",
"@types/js-yaml": "3.12.1",
"@octokit/rest": "16.43.0",
"@types/eslint": "6.1.7",
"@types/js-yaml": "3.12.2",
"@types/qs": "6.9.0",
"@types/table": "4.0.7",
"@types/yaml": "1.2.0",
"axios": "0.19.1",
"axios": "0.19.2",
"bitbucket": "1.17.1",
"colors": "1.4.0",
"command-exists": "1.2.8",
Expand All @@ -55,9 +55,9 @@
"oclif": "1.15.2",
"qs": "6.9.1",
"reflect-metadata": "0.1.13",
"semver": "7.1.1",
"semver": "7.1.2",
"shelljs": "0.8.3",
"simple-git": "1.130.0",
"simple-git": "1.131.0",
"table": "5.4.6",
"toposort": "2.0.2",
"ts-node": "8.6.2",
Expand All @@ -74,27 +74,27 @@
"@types/debug": "4.1.5",
"@types/git-url-parse": "9.0.0",
"@types/glob": "7.1.1",
"@types/jest": "24.9.0",
"@types/jest": "25.1.1",
"@types/lodash": "4.14.149",
"@types/node": "12.12.25",
"@types/node": "12.12.26",
"@types/rimraf": "2.0.3",
"@types/semver": "6.2.0",
"@types/semver": "7.1.0",
"@types/shelljs": "0.8.6",
"@types/toposort": "2.0.3",
"@types/update-notifier": "2.5.0",
"@types/xml2js": "0.4.5",
"@typescript-eslint/eslint-plugin": "2.16.0",
"@typescript-eslint/parser": "2.16.0",
"codecov": "3.6.1",
"eslint-config-prettier": "6.9.0",
"@typescript-eslint/eslint-plugin": "2.18.0",
"@typescript-eslint/parser": "2.18.0",
"codecov": "3.6.4",
"eslint-config-prettier": "6.10.0",
"eslint-plugin-prettier": "3.1.2",
"jest": "25.1.0",
"nock": "11.7.2",
"prettier": "1.19.1",
"rimraf": "3.0.0",
"semantic-release": "16.0.2",
"rimraf": "3.0.1",
"semantic-release": "16.0.4",
"semantic-release-slack-bot": "1.4.2",
"ts-jest": "25.0.0"
"ts-jest": "25.1.0"
},
"engineStrict": true,
"engines": {
Expand Down
Loading

0 comments on commit bf633a2

Please sign in to comment.