Merge branch 'master' into sync

Conflicts: lib/websocket.js
2015-01-26 16:45:12 +01:00 · 2015-01-26 16:45:12 +01:00 · c5610398d5
parent a7f4448f34 063f69d51d
commit c5610398d5
1 changed files with 1 additions and 1 deletions
--- a/lib/web3.js
+++ b/lib/web3.js
@ -144,7 +144,7 @@ var shhWatchMethods = function () {
    return [
    { name: 'newFilter', call: 'shh_newFilter' },
    { name: 'uninstallFilter', call: 'shh_uninstallFilter' },
-    { name: 'getMessage', call: 'shh_getMessages' }
+    { name: 'getMessages', call: 'shh_getMessages' }
    ];
 };