Merge branch 'master'

2021-01-26 18:58:15 +01:00
parent b8187aa529 18c7efe800
commit 6d202894b6
99 changed files with 2517 additions and 15875 deletions
--- a/contracts/token/ERC721/ERC721Burnable.sol
+++ b/contracts/token/ERC721/ERC721Burnable.sol
@ -2,7 +2,7 @@

 pragma solidity ^0.7.0;

-import "../../GSN/Context.sol";
+import "../../utils/Context.sol";
 import "./ERC721.sol";

 /**