Merge branch 'master' into kuba-test-mode

This commit is contained in:
Jacob Hoffman-Andrews 2015-05-21 23:43:30 -07:00
commit d2425e5283

View file

@ -62,7 +62,7 @@ class Client(object):
# TODO: Allow for other alg types besides RS256
self.network = network2.Network(
config.server_url, jwk.JWKRSA.load(self.account.key.pem),
config.server, jwk.JWKRSA.load(self.account.key.pem),
verify_ssl=(not config.test_mode))
self.config = config