Francisco Giordano 5609cd4c74 Fix merge errors

2021-01-27 18:04:52 -03:00

..

access

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

cryptography

Merge branch 'master'

2021-01-26 18:58:15 +01:00

drafts

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

GSN

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

introspection

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

math

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

mocks

Fix merge errors

2021-01-27 18:04:52 -03:00

payment

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

presets

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00

proxy

Fix merge errors

2021-01-27 18:04:52 -03:00

token

Fix merge errors

2021-01-27 18:04:52 -03:00

utils

Fix merge errors

2021-01-27 18:04:52 -03:00

package.json

Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:28:23 +01:00