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