Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:16:05 +01:00
parent 974c534210 fa33fbce75
commit 0db76e98f9
77 changed files with 2301 additions and 1859 deletions
--- a/contracts/access/AccessControl.sol
+++ b/contracts/access/AccessControl.sol
@ -4,7 +4,7 @@ pragma solidity ^0.8.0;

 import "../utils/EnumerableSet.sol";
 import "../utils/Address.sol";
-import "../GSN/Context.sol";
+import "../utils/Context.sol";

 /**
 * @dev Contract module that allows children to implement role-based access