fix(merge) Fixes after merging various changes

This commit is contained in:
Erik Ziegler committed 2018-07-12 15:22:07 +02:00
1 parent 589be952b7
commit 4279396f9f
18 files changed
+2179 -8674

No files matched your search

+3 -3
View File
@@ -9,10 +9,10 @@
"version": "1.0.0",
"description": "",
"dependencies": {
"babel-runtime": "^6.23.0",
"@babel/runtime": "^7.0.0-beta.53",
"bcrypt": "^0.8.7",
"loglevel": "^1.4.1",
"meteor-node-stubs": "^0.2.3"
"loglevel": "^1.6.1",
"url": "^0.11.0"
},
"devDependencies": {
"babel-eslint": "^6.1.2",