Merge remote-tracking branch 'origin/mnesbit-cor-261-artemis-over-ssl' into mnesbit-cor-261-artemis-over-ssl

Browse Source

# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/crypto/WhitelistTrustManager.kt

...

This commit is contained in:

Matthew Nesbit 2016-07-26 10:36:42 +01:00

parent cb8876678e fd441d5e3e

commit 4c4484b820

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available