fix: merge develop
This commit is contained in:
Sebastian Rindom committed
commit
a468c451e8
37 files changed
+121
-17
No files matched your search
@@ -32,7 +32,11 @@
|
||||
"medusa-interfaces": "1.x"
|
||||
},
|
||||
"dependencies": {
|
||||
<<<<<<< HEAD
|
||||
"medusa-core-utils": "^1.1.4",
|
||||
=======
|
||||
"medusa-core-utils": "^1.1.5",
|
||||
>>>>>>> origin/develop
|
||||
"medusa-test-utils": "^1.1.8",
|
||||
"mongoose": "^5.8.0"
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user