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
No related branches found
No related tags found
Showing
- bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java 7 additions, 0 deletions...oject/bramble/api/versioning/ClientVersioningManager.java
- bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java 31 additions, 7 deletions...oject/bramble/versioning/ClientVersioningManagerImpl.java
- bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java 325 additions, 0 deletions...t/bramble/versioning/ClientVersioningManagerImplTest.java
- briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java 14 additions, 4 deletions...ject/briar/android/conversation/AttachmentController.java
- briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java 9 additions, 55 deletions...ject/briar/android/conversation/ConversationActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java 151 additions, 1 deletion...ect/briar/android/conversation/ConversationViewModel.java
- briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 20 additions, 2 deletions...ain/java/org/briarproject/briar/android/util/UiUtils.java
- briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java 3 additions, 2 deletions...rg/briarproject/briar/api/messaging/MessagingManager.java
- briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java 11 additions, 3 deletions...rg/briarproject/briar/messaging/MessagingManagerImpl.java
Loading
Please register or sign in to comment