Torsten Grote 9dec498e7e Merge branch 'add-contact-transaction' into 'master' ...

Add contact and transport keys in the same transaction

This avoids a potential problem where the app crashes after adding the contact but before adding the transport keys, leaving the contact unusable.

See merge request !112

2016-02-29 14:07:33 +00:00

..

src/org/briarproject/api

Merge branch 'add-contact-transaction' into 'master'

2016-02-29 14:07:33 +00:00

.gitignore

Use Java 1.6 instead of 1.5. We no longer aim to support OS X 10.4.

2013-11-22 12:00:00 +00:00

build.gradle

Giant whitespace-only indentation patch.

2016-02-05 14:54:17 +00:00