Merge branch 'master' into peer-dep

2018-10-10 09:09:06 -03:00
parent 45747144ff 488c3de389
commit fffa406aa4
47 changed files with 95 additions and 1 deletions
--- a/contracts/examples/SimpleToken.sol
+++ b/contracts/examples/SimpleToken.sol
@ -26,4 +26,6 @@ contract SimpleToken is Initializable, ERC20 {
    _mint(sender, INITIAL_SUPPLY);
  }

+
+  uint256[50] private ______gap;
 }