Merge branch '1.0' into issue/2500

web3 · Mar 18, 2019 · f0eb85e · f0eb85e
2 parents 2b3a524 + 4bd1410
commit f0eb85e
Show file tree

Hide file tree

Showing 49 changed files with 11,477 additions and 14,439 deletions.
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