Merge branch 'master' into tx-broadcast

Conflicts: ethcore/src/client/traits.rs
2016-12-10 15:23:53 +01:00
parent e1ade5b375 60ea787bd1
commit 704054ef40
47 changed files with 398 additions and 398 deletions
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -43,7 +43,7 @@ export default {
        },
        uuid: {
          type: String,
-          desc: 'The account UUID, or null if not available/unknown/not applicable.'
+          desc: 'The account Uuid, or null if not available/unknown/not applicable.'
        }
      }
    }
@@ -66,7 +66,7 @@ export default {
        },
        uuid: {
          type: String,
-          desc: 'The account UUID, or null if not available/unknown/not applicable.'
+          desc: 'The account Uuid, or null if not available/unknown/not applicable.'
        }
      }
    }