Remove foreign changes

Merge remote-tracking branch 'origin/master' into lash/version-conflict
Final attempt before deferring to devops
2021-04-25 14:14:05 +02:00 · 2021-04-25 14:12:00 +02:00 · 2021-04-25 11:49:31 +02:00 · 2021-04-25 11:45:32 +02:00 · 2021-04-25 11:39:40 +02:00 · 2021-04-25 11:37:58 +02:00
2 changed files with 4 additions and 4 deletions
--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@@ -10,7 +10,7 @@ version = (
        0,
        11,
        0,
-        'beta.9',
+        'beta.10',
        )

 version_object = semver.VersionInfo(
--- a/apps/contract-migration/scripts/requirements.txt
+++ b/apps/contract-migration/scripts/requirements.txt
@@ -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
Author	SHA1	Message	Date
nolash	f4bbd22f54	Remove foreign changes	2021-04-25 14:14:05 +02:00
nolash	b99b5bd4fa	Merge remote-tracking branch 'origin/master' into lash/version-conflict	2021-04-25 14:12:00 +02:00
nolash	8f33ce40e1	Final attempt before deferring to devops	2021-04-25 11:49:31 +02:00
nolash	3a63d0505f	Another attempt at running ci for scripts	2021-04-25 11:45:32 +02:00
nolash	334c63b1e6	Poking script setup as it doesnt work like it did before	2021-04-25 11:39:40 +02:00
nolash	b123e050c3	Add script invocation	2021-04-25 11:37:58 +02:00
nolash	e27d5d8b33	scripts ci typo	2021-04-25 11:33:23 +02:00
nolash	cc35c498c8	Attempt add script ci	2021-04-25 11:32:20 +02:00
nolash	dea7bc8a1c	Fix cic-ussd cic-eth conflict	2021-04-25 10:52:39 +02:00