Merge master

Signed-off-by: alperozturk <[email protected]>
nextcloud · Dec 4, 2023 · 694e632 · 694e632
2 parents 285d9df + 11973d6
commit 694e632
Show file tree

Hide file tree

Showing 5 changed files with 257 additions and 257 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java