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/payment/ConditionalEscrow.sol
+++ b/contracts/payment/ConditionalEscrow.sol
@ -24,4 +24,6 @@ contract ConditionalEscrow is Initializable, Escrow {
    require(withdrawalAllowed(payee));
    super.withdraw(payee);
  }
+
+  uint256[50] private ______gap;
 }