Merge branch 'master' into ng-ui-fixes

2016-12-10 20:23:09 +01:00
parent 0f6681d3e8 08a47ea2d4
commit 89ed76497e
56 changed files with 457 additions and 431 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.'
        }
      }
    }