tudor.malene@gmail.com 40825fef99 Merge branch 'tudor_merge_os_master' into feature/ENT-2222/constraints_propagation_private ... # Conflicts: # node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt # testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt		2018-10-02 16:10:19 +01:00
..
isolated	Fixes bugs with contract constraints (#1696)	2017-10-02 17:54:32 +01:00
src	Merge branch 'tudor_merge_os_master' into feature/ENT-2222/constraints_propagation_private	2018-10-02 16:10:19 +01:00
build.gradle	Syncing Cordapp info code from ENT so that ENT-1731 is fully ported (#3914)	2018-09-10 10:43:00 +01:00