Merge branch 'lash/version-conflict' into 'master'

Fix cic-ussd cic-eth conflict

See merge request grassrootseconomics/cic-internal-integration!118
This commit is contained in:
Louis Holbrook 2021-04-25 12:14:55 +00:00
commit f7a69830ba
2 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@ version = (
0,
11,
0,
'beta.9',
'beta.10',
)
version_object = semver.VersionInfo(

View File

@ -1,5 +1,5 @@
cic-base[full_graph]==0.1.2a77
cic-base[full_graph]==0.1.2b2
sarafu-faucet==0.0.2a28
cic-eth==0.11.0b6
cic-eth==0.11.0b10
cic-types==0.1.0a10
crypto-dev-signer==0.4.14b2
crypto-dev-signer==0.4.14b3