Skip to content

Commit

Permalink
Merge remote-tracking branch 'simelo/stdevAlDen_t34_hardware-wallet_t…
Browse files Browse the repository at this point in the history 
…ests' into stdevAlDen_t34_hardware-wallet_tests

Conflicts:
	Makefile
  • Loading branch information
Alvaro Denis committed May 26, 2019
2 parents dab1157 + 43a22e5 commit edde8c4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit edde8c4

Please sign in to comment.