Shams Asari bb74f0ca34 Merge pull request #427 from corda/shams-consistent-guava-deps ...

Upgraded both guava and guava-testlib to 21.0 and made sure they shar…

2017-03-24 18:30:11 +00:00

..

bft-smart-config

Implement bft-smart notary prototype

2017-02-20 12:08:22 +00:00

capsule

Integrate CRaSH shell (SSHD). Joint effort between Mike Hearn and Marek Skocovsky.

2017-03-24 12:44:54 +01:00

src

Merge pull request #427 from corda/shams-consistent-guava-deps

2017-03-24 18:30:11 +00:00

webserver

Include CordaCaplet$1 to fix WebServer startup. (#430)

2017-03-24 17:14:20 +00:00

build.gradle

Fix merging: (#426)

2017-03-24 13:38:26 +00:00