Mike Hearn 54a73166c3 Merge branch 'master' into PLT-61-resolve-deps		2016-02-18 17:22:35 +01:00
..
src/main	Trading: in the two party trade protocol, check that the proposed transaction is contract-valid, and that the missing signatures are what is expected.	2016-02-17 18:38:24 +01:00
build.gradle	Minor: tweak build file to describe how to activate Dokka API docs	2016-02-18 13:43:15 +01:00