Merge branch 'release' into develop

Conflicts:
	npm-shrinkwrap.json
	package.json
This commit is contained in:
Geert Weening
2015-07-22 11:59:36 -07:00
4 changed files with 20 additions and 5 deletions

8
npm-shrinkwrap.json generated
View File

@@ -1,16 +1,16 @@
{
"name": "ripple-lib",
"version": "0.12.5-rc2",
"version": "0.12.5",
"npm-shrinkwrap-version": "5.4.0",
"node-version": "v0.12.3",
"node-version": "v0.12.6",
"dependencies": {
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
},
"babel-runtime": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.7.0.tgz",
"version": "5.8.3",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.3.tgz",
"dependencies": {
"core-js": {
"version": "0.9.18",