-
akwizgran authored
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java # briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
# Conflicts: # briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java # briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java