Jose Coll 74e89181da Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor ...

# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
#	node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt

Fixed conflict.

2016-10-27 12:57:37 +01:00

..

src

Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor

2016-10-27 12:57:37 +01:00

build.gradle

Rewrote comment to improve readability.

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