Hai Brenner 49551dc36b Merge branch 'master' into vbdev2 ... Conflicts: meerkat-common/src/main/proto/meerkat/voting.proto		2016-07-06 21:55:34 +03:00
..
src	Merge branch 'master' into vbdev2	2016-07-06 21:55:34 +03:00
build.gradle	Merge branch 'master' into vbdev2	2016-07-06 21:55:34 +03:00
gradlew	Moved to multi-project gradle build; added (non-working) hello world for bulletin-board server using Jetty and Jersey	2015-11-09 16:01:59 +02:00