akwizgran d6a7e6d52c Resolve merge conflicts. ...

# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java

2017-11-21 10:27:31 +00:00

..

.tx

Add Simplified Chinese translation

2017-09-27 13:32:07 -03:00

artwork

Update all logos

2016-12-15 15:19:38 -02:00

src

Resolve merge conflicts.

2017-11-21 10:27:31 +00:00

.gitignore

Updated java.library.path.

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

build.gradle

Resolve merge conflicts.

2017-11-21 10:27:31 +00:00

proguard-rules.txt

Updated java.library.path.

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

project.properties

tweaked proguard

2016-02-02 12:21:08 +01:00