8 Commits

Author	SHA1	Message	Date
Michal Kit	b6fd5ede58	Merge community-master	2017-08-15 12:04:09 +01:00
Mike Hearn	291049f66e	Fixup after merge	2017-08-01 16:13:37 +02:00
Andras Slemmer	eac7db295c	Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-july-13	2017-07-13 12:35:20 +01:00
Andras Slemmer	4f85026dfc	Merge remote-tracking branch 'open/master'	2017-06-27 14:45:30 +01:00
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