Merge branch '1.0' into issue/2507

web3 · Mar 18, 2019 · 0aa710a · 0aa710a
2 parents d20f9c4 + 156f209
commit 0aa710a
Show file tree

Hide file tree

Showing 56 changed files with 11,539 additions and 14,482 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ addons:
     packages:
     - g++-4.8
 before_script:
+    - npm i -g typescript@next
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
 install:

diff --git a/docs/web3-eth-accounts.rst b/docs/web3-eth-accounts.rst
@@ -306,7 +306,7 @@ Parameters
 Returns
 -------
 
-``String|Object``: The signed data RLP encoded signature, or if ``returnSignature`` is ``true`` the signature values as follows:
+``Object``: The signed data RLP encoded signature, or if ``returnSignature`` is ``true`` the signature values as follows:
     - ``message`` - ``String``: The the given message.
     - ``messageHash`` - ``String``: The hash of the given message.
     - ``r`` - ``String``: First 32 bytes of the signature