akwizgran 03191ff08f Merge branch 'master' into 'preference-switches' ...

# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

2018-08-14 09:59:22 +00:00

..

androidTest/java/org/briarproject/briar/android

Rename Main Flavor due to internal conflicts

2018-08-08 16:52:28 -03:00

debug/res/values

Move res values from build.gradle into strings.xml

2018-08-03 13:08:18 -03:00

main

Merge branch 'master' into 'preference-switches'

2018-08-14 09:59:22 +00:00

screenshotDebug

Move res values from build.gradle into strings.xml

2018-08-03 13:08:18 -03:00

test/java

Move identity creation into AccountManager.

2018-08-02 09:51:17 +01:00