Hai Brenner d12ad408c4 Merge branch 'master' into vbdev2 ... Conflicts: meerkat-common/src/main/proto/meerkat/voting.proto		2016-06-26 17:17:24 +03:00
..
src/main/java/meerkat/voting	Just added comments as part of the process to comment all the VB files.	2016-06-21 15:37:20 +03:00
build.gradle	fixed some merge conflicts which appeared for some unknown reason	2016-06-26 17:07:03 +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