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/utils/Address.sol
+++ b/contracts/utils/Address.sol
@ -25,5 +25,4 @@ library Address {
    assembly { size := extcodesize(account) }
    return size > 0;
  }
-
 }
--- a/contracts/utils/ReentrancyGuard.sol
+++ b/contracts/utils/ReentrancyGuard.sol
@ -32,4 +32,5 @@ contract ReentrancyGuard is Initializable {
    require(localCounter == _guardCounter);
  }

+  uint256[50] private ______gap;
 }