Esteban MIno e743f44150 fix conflicts

2018-08-28 15:20:30 -03:00

..

data

…

e2e

Fix tests

2018-08-23 19:19:48 -07:00

integration

Revert changes to tx-list-items.json, and to mock getTransactionCount method in tx-list-items integration test.

2018-08-27 17:07:01 -02:30

lib

fix merge conflicts

2018-08-17 12:56:07 -04:00

screens

fix warning for new-ui screen tests

2018-07-02 20:13:04 -04:00

stub

Merge branch 'develop' into testing

2018-05-21 14:57:57 -07:00

unit

fix conflicts

2018-08-28 15:20:30 -03:00

base.conf.js

eslint --fix .

2018-07-02 18:49:33 -04:00

flat.conf.js

eslint --fix .

2018-07-02 18:49:33 -04:00

helper.js

fix merge conflicts

2018-08-17 12:56:07 -04:00

mascara.conf.js

fix test/mascara.conf.js warnings

2018-07-02 19:53:45 -04:00

setup.js

…