Commit Graph

4 Commits

Author SHA1 Message Date
Mike Hearn
ca8f5050cf Merge branch 'master' into mike-enterprise-merge-june-20th 2017-06-21 19:49:33 +02:00
Andrius Dagys
376a9d399f Merge remote-tracking branch 'open/master' 2017-05-24 12:19:49 +01:00
Andrius Dagys
550be76787 Fix post-merge issues:
- Update Doorman to reflect the X500 naming and configuration changes
- Minor other changes
2017-05-11 17:56:32 +01:00
Andras Slemmer
528c9efe9d Add sgx build, documentation, verify-enclave 2017-03-24 18:23:04 +00:00