5 Commits

Author	SHA1	Message	Date
Matthew Nesbit	0f98a1cbcd	Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702 ... # Conflicts: # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt	2018-07-02 11:31:18 +01:00
szymonsztuka	470921afb9	ENT-1741 Build standalone shell JAR distribution - subsequent fix (#3476)	2018-06-29 12:03:18 +01:00
szymonsztuka	0a700fd3f0	ENT-1741 Build standalone shell JAR distribution - fix (#3474)	2018-06-29 10:32:37 +01:00
Andrius Dagys	a9cdb576e6	Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2	2018-06-21 14:02:37 +01:00
szymonsztuka	3af5412d40	ENT-1741 Build standalone shell JAR distribution (#3409)	2018-06-21 10:32:36 +01:00