Merge remote-tracking branch 'romain/wip' into nodejs-romain
Conflicts: src/jio.storage/erp5storage.js
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/jio-v3.17.0.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/jio-v3.17.0.min.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
{ | ||
"name": "jio", | ||
"version": "v3.16.0", | ||
"version": "v3.17.0", | ||
"license": "LGPLv3", | ||
"author": "Nexedi SA", | ||
"contributors": [ | ||
... | ... | @@ -29,7 +29,7 @@ |
"cloud" | ||
], | ||
"dependencies": { | ||
"rsvp": "git+https://lab.nexedi.com/nexedi/rsvp.js.git", | ||
"rsvp": "git+https://lab.nexedi.com/romain/rsvp.js.git#wip", | ||
"uritemplate": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git", | ||
"moment": "2.13.0", | ||
"rusha": "0.8.2", | ||
... | ... | @@ -45,7 +45,7 @@ |
"sinon": "~2.1.0" | ||
}, | ||
"devDependencies": { | ||
"renderjs": "git+https://lab.nexedi.com/nexedi/renderjs.git", | ||
"renderjs": "git+https://lab.nexedi.com/romain/renderjs.git#wip", | ||
"grunt": "0.4.x", | ||
"grunt-cli": "~0.1.11", | ||
"grunt-contrib-concat": "0.3.x", | ||
... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Please register or sign in to comment