Hai Brenner 6b512e078b Merge branch 'master' into dist_dec ... # Conflicts: # meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java # meerkat-common/src/main/proto/meerkat/BulletinBoardAPI.proto # settings.gradle		2016-08-09 14:30:40 +03:00
..
src	Merge branch 'master' into dist_dec	2016-08-09 14:30:40 +03:00
.gitignore	Code review comments and channges	2016-04-05 15:36:00 +03:00
build.gradle	Merge branch 'master' into dist_dec	2016-08-09 14:30:40 +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