akwizgran ddc9b5b066 Merge branch '1256-adding-contacts-headless' into 'master' ...

Add a REST endpoint for adding contacts

Closes #1256

See merge request briar/briar!1094

2019-05-16 14:05:48 +00:00

..

main/java/org/briarproject/briar

Merge branch '1556-key-manager-methods-for-pending-contacts' into 'master'

2019-05-15 19:57:32 +00:00

test/java/org/briarproject/briar

Merge branch '1256-adding-contacts-headless' into 'master'

2019-05-16 14:05:48 +00:00