Consolidated ERC20 Interface and Implementation Files#1125

Merged

frangio merged 9 commits into

OpenZeppelin:masterfrom

dougiebuckets:consolidate-ERC20-interfaces-and-implementation-files-#1098

Aug 3, 2018

Commits on Jul 27, 2018

Consolidted ERC20 Interface and Implementation Files
Doug Crescenzi
committed

Commits on Jul 28, 2018

Fixed CanReclaimToken's tests to use StandardTokenMock instead of BasicTokenMock
Doug Crescenzi
committed
Changed token's variable type in TokenTimelock to ERC20
Doug Crescenzi
committed
Merged the StandardBurnableToken with BurnableToken since it now inherits from StandardToken; Fixed TokenTimelock so it uses SafeERC20 for ERC20
Doug Crescenzi
committed

Commits on Jul 29, 2018

Fixed variable type for _token in TokenTimelock constructor
Doug Crescenzi
committed
Resolved merge conflicts
Doug Crescenzi
committed

Commits on Jul 30, 2018

Fixed linting warning in BurnableToken
Doug Crescenzi
committed

Commits on Aug 2, 2018