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
..
2018-05-23 11:16:56 -04:00
2018-06-01 13:53:09 -04:00
2018-06-01 13:44:54 -04:00
2018-05-30 11:03:33 -04:00
2018-06-01 13:53:09 -04:00
2018-05-30 10:57:25 -04:00
2018-05-30 10:57:25 -04:00
2018-06-01 14:10:54 +10:00
2018-06-01 13:44:54 -04:00