aboutsummaryrefslogtreecommitdiffstats
path: root/docs/solidity-in-depth.rst
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-01-13 20:05:02 +0800
committerGitHub <noreply@github.com>2017-01-13 20:05:02 +0800
commit60cc1668517f56ce6ca8225555472e7a27eab8b0 (patch)
tree8eac35131efc4beeee921356052375233edd7102 /docs/solidity-in-depth.rst
parent822622cf5bf23e79a6e2292cb837d1a39ca1c419 (diff)
parente22672b7c739dde9f37a919e63245abda4b1fc89 (diff)
downloaddexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.gz
dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.zst
dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.zip
Merge pull request #1561 from ethereum/develop
Merge develop into release for 0.4.8
Diffstat (limited to 'docs/solidity-in-depth.rst')
-rw-r--r--docs/solidity-in-depth.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/solidity-in-depth.rst b/docs/solidity-in-depth.rst
index 40704698..b6217b47 100644
--- a/docs/solidity-in-depth.rst
+++ b/docs/solidity-in-depth.rst
@@ -16,4 +16,5 @@ If something is missing here, please contact us on
units-and-global-variables.rst
control-structures.rst
contracts.rst
+ assembly.rst
miscellaneous.rst