akwizgran f68d8d284f Merge branch 'master' into 'reflected-transport-properties' ...

# Conflicts:
#   bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java

2020-07-21 09:18:29 +00:00

..

src

Merge branch 'master' into 'reflected-transport-properties'

2020-07-21 09:18:29 +00:00

.gitignore

Updated java.library.path.

2016-11-30 18:10:49 +00:00

build.gradle

AndroidX migration and library updates

2019-11-01 11:44:36 -03:00

witness.gradle

AndroidX migration and library updates

2019-11-01 11:44:36 -03:00