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/token/ERC20/ERC20Pausable.sol
+++ b/contracts/token/ERC20/ERC20Pausable.sol
@ -70,4 +70,6 @@ contract ERC20Pausable is Initializable, ERC20, Pausable {
  {
    return super.decreaseAllowance(spender, subtractedValue);
  }
+
+  uint256[50] private ______gap;
 }