Merge branch 'bitshares' of https://github.com/bitshares/bitshares-2 into bitshares

This commit is contained in:
Daniel Larimer 2015-10-13 11:34:16 -04:00
commit a4d87ec8c7

View file

@ -1353,7 +1353,7 @@ FC_REFLECT( graphene::wallet::brain_key_info,
(brain_priv_key)
(wif_priv_key)
(pub_key)
);
)
FC_REFLECT( graphene::wallet::exported_account_keys, (account_name)(encrypted_private_keys)(public_keys) )