Torsten Grote d2290e2037 Merge branch '1560-forum-sharing-integration-test' into 'master' ...

Fix race conditions in ForumSharingIntegrationTest

Closes #1560

See merge request briar/briar!1119

2019-06-04 11:47:49 +00:00

..

main/java/org/briarproject/briar

Derive handshake root key when converting pending contact.

2019-05-30 17:27:07 +01:00

test/java/org/briarproject/briar

Merge branch '1560-forum-sharing-integration-test' into 'master'

2019-06-04 11:47:49 +00:00