Skip to content
Snippets Groups Projects
Verified Commit 9d07b2e1 authored by akwizgran's avatar akwizgran
Browse files

Resolve merge conflicts.

# 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
parents 2332a586 5c312b49
No related branches found
No related tags found
Loading
Pipeline #2896 passed
Showing
with 571 additions and 74 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment