Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1
2019-01-18 15:33:51 -03:00
parent bce2d68e7f ae02103e47
commit a221c17fb2
237 changed files with 8562 additions and 4937 deletions
--- a/contracts/mocks/ERC20BurnableMock.sol
+++ b/contracts/mocks/ERC20BurnableMock.sol
@ -1,12 +1,9 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;

 import "../token/ERC20/ERC20Burnable.sol";

-
 contract ERC20BurnableMock is ERC20Burnable {
-
    constructor(address initialAccount, uint256 initialBalance) public {
        _mint(initialAccount, initialBalance);
    }
-
 }