Jonathan Rainville aa04279a6f Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi ... # Conflicts: # lib/contracts/contract_deployer.js # lib/i18n/locales/en.json # lib/tests/test.js # package-lock.json		2018-06-01 13:57:39 -04:00
..
run_tests.js	remove timer	2018-06-01 13:44:54 -04:00
test.js	Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi	2018-06-01 13:57:39 -04:00
test_logger.js	add id to solc process to avoid multiple callback calls	2018-06-01 13:44:35 -04:00