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/lifecycle/Pausable.sol
+++ b/contracts/lifecycle/Pausable.sol
@ -56,4 +56,6 @@ contract Pausable is Initializable, PauserRole {
    _paused = false;
    emit Unpaused();
  }
+
+  uint256[50] private ______gap;
 }