Merge branch 'develop' into 'jwt'
# Conflicts: # src/config.json
Showing
... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
"scripts": { | "scripts": { | ||
"build": "gulp build", | "build": "gulp build", | ||
"doc": "gulp generate:doc", | "doc": "gulp generate:doc", | ||
"start": "cross-env NODE_ENV=development gulp watch", | "start": "cross-env NODE_ENV=development gulp watch ", | ||
"start:prod": "cross-env NODE_ENV=production gulp watch", | "start:prod": "cross-env NODE_ENV=production gulp watch", | ||
"run:test": "cross-env NODE_ENV=test gulp test", | "run:test": "cross-env NODE_ENV=test gulp test", | ||
"tslint": "gulp tslint", | "tslint": "gulp tslint", | ||
... | @@ -62,7 +62,7 @@ | ... | @@ -62,7 +62,7 @@ |
"lint-staged": "10.0.7", | "lint-staged": "10.0.7", | ||
"remap-istanbul": "0.13.0", | "remap-istanbul": "0.13.0", | ||
"rimraf": "3.0.2", | "rimraf": "3.0.2", | ||
"sequelize-cli": "5.5.1", | "sequelize-cli": "^5.5.1", | ||
"tslint": "6.0.0", | "tslint": "6.0.0", | ||
"typedoc": "0.16.10", | "typedoc": "0.16.10", | ||
"typescript": "3.8.2", | "typescript": "3.8.2", | ||
... | ... |
Please register or sign in to comment