Merge branch 'master' into fix/docs

2017-11-15 18:19:12 -03:00
parent 2cb2799a51 7a19bcf6d9
commit 689e18aab5
23 changed files with 308 additions and 90 deletions
--- a/docs/source/getting-started.rst
+++ b/docs/source/getting-started.rst
@ -9,6 +9,7 @@ OpenZeppelin integrates with `Truffle <https://github.com/ConsenSys/truffle/>`_,

 To install the OpenZeppelin library, run::

+	npm init # follow instructions
 	npm install zeppelin-solidity

 	# If you are using yarn, add dependency like this -