Merge branch 'release' into develop

This commit is contained in:
Geert Weening
2015-07-24 15:39:50 -07:00
2 changed files with 6 additions and 2 deletions

View File

@@ -1,3 +1,7 @@
##0.12.6
+ [Fix webpack require failure due to "./" notation](https://github.com/ripple/ripple-lib/commit/8d9746d7b10be203ee613df523c2522012ff1baf)
##0.12.15
+ [Add offer autobridging](https://github.com/ripple/ripple-lib/commit/c7bbce83719c1e8c6a4fae5ca850e7515db1a4a5)

4
npm-shrinkwrap.json generated
View File

@@ -9,8 +9,8 @@
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
},
"babel-runtime": {
"version": "5.8.3",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.3.tgz",
"version": "5.8.5",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.5.tgz",
"dependencies": {
"core-js": {
"version": "0.9.18",