Jose Coll b46de0b964 Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes ...

# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
#	core/src/main/kotlin/com/r3corda/core/testing/InMemoryVaultService.kt
#	node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt

2016-10-28 09:59:58 +01:00

..

src

Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes

2016-10-28 09:59:58 +01:00

build.gradle

Rewrote comment to improve readability.

2016-10-25 10:01:52 +01:00