ameba23 48d943d98e Resolve merge conflict with social-backup-poc

2022-03-04 10:13:20 +01:00

..

src

Resolve merge conflict with social-backup-poc

2022-03-04 10:13:20 +01: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

Move AuthorInfo from bramble to briar

2021-01-21 09:20:01 -03:00

witness.gradle

Also upgrade obfs4proxy and bramble-java's Tor.

2021-02-09 12:05:54 +00:00