Merge remote-tracking branch 'upstream/master'

Browse Source

...

This commit is contained in:

Aniket-Engg

2019-01-02 11:33:46 +05:30

parent 3c80767270 63ce358f30

commit dca581a2d9

2 changed files with 2 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

contracts/mocks/DetailedERC20Mock.sol → contracts/mocks/ERC20DetailedMock.sol