Gerardo Nardelli 0694fc24e9 Merge branch 'master' into amb-oracle ... # Conflicts: # oracle-e2e/deploy.js # oracle-e2e/docker-compose.yml # oracle-e2e/run-tests.sh # oracle/config/base.config.js # oracle/src/services/gasPrice.js # oracle/src/utils/utils.js # oracle/test/gasPrice.test.js		2019-07-17 10:00:10 -03:00
..
affirmation-request-watcher.config.js	Oracle using commons (#144)	2019-07-12 14:37:41 +02:00
base.config.js	Merge branch 'master' into amb-oracle	2019-07-17 10:00:10 -03:00
collected-signatures-watcher.config.js	Update the token-bridge sub-repo (#19)	2019-05-07 16:52:44 +02:00
foreign-sender.config.js	Remove reduntant dotenv configs	2019-06-07 13:00:07 +02:00
home-sender.config.js	Remove reduntant dotenv configs	2019-06-07 13:00:07 +02:00
signature-request-watcher.config.js	Update the token-bridge sub-repo (#19)	2019-05-07 16:52:44 +02:00