Merge branch 'develop' of github.com:HabitRPG/habitica into develop

This commit is contained in:
Matteo Pagliazzi 2019-03-31 20:09:12 +02:00
commit b7e391e074
2 changed files with 432 additions and 615 deletions

1041
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -9,7 +9,7 @@
"accepts": "^1.3.5",
"amazon-payments": "^0.2.7",
"amplitude": "^3.5.0",
"amplitude-js": "^4.6.0-beta.2",
"amplitude-js": "^5.0.0",
"apidoc": "^0.17.5",
"apn": "^2.2.0",
"autoprefixer": "^9.4.0",
@ -69,7 +69,7 @@
"nconf": "^0.10.0",
"node-gcm": "^1.0.2",
"node-sass": "^4.9.0",
"nodemailer": "^5.0.0",
"nodemailer": "^6.0.0",
"ora": "^3.0.0",
"pageres": "^4.1.1",
"passport": "^0.4.0",
@ -87,7 +87,7 @@
"short-uuid": "^3.0.0",
"smartbanner.js": "^1.9.1",
"stripe": "^5.9.0",
"superagent": "^4.0.0",
"superagent": "^5.0.2",
"svg-inline-loader": "^0.8.0",
"svg-url-loader": "^2.3.2",
"svgo": "^1.0.5",