Merge branch 'master' into HEAD

Conflicts: trezor_agent/factory.py
2026-04-21 22:06:27 +08:00 · 2016-10-04 10:37:52 +03:00
parent 459b882b89 5a64954324
commit 784e14647a
10 changed files with 70 additions and 35 deletions
--- a/trezor_agent/factory.py
+++ b/trezor_agent/factory.py
@@ -1,4 +1,5 @@
-"""Thin wrapper around trezor/keepkey/ledger libraries."""
+"""Thin wrapper around trezor/keepkey libraries."""
+from __future__ import absolute_import
 import binascii
 import collections
 import logging