Andras Slemmer d52accb52c Merge open/master		2017-03-13 11:52:18 +00:00
..
bft-smart-config	Implement bft-smart notary prototype	2017-02-20 12:08:22 +00:00
capsule	Added bits of versioning info to the node	2017-03-09 16:36:21 +00:00
src	Merge open/master	2017-03-13 11:52:18 +00:00
webserver	Merge branch 'mike-json-support-module'	2017-03-08 15:06:50 +01:00
build.gradle	Merge open/master	2017-03-13 11:52:18 +00:00