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

View File

@@ -1,6 +1,6 @@
{
"name": "ripple-lib",
"version": "0.12.5-rc2",
"version": "0.12.5",
"license": "ISC",
"description": "A JavaScript API for interacting with Ripple in Node.js and the browser",
"files": [