Merge master

Signed-off-by: alperozturk <[email protected]>
nextcloud · Oct 26, 2023 · c9421c0 · c9421c0
2 parents ea099b5 + 27611c4
commit c9421c0
Show file tree

Hide file tree

Showing 8 changed files with 750 additions and 714 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -12,6 +12,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+    group: code-ql-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

diff --git a/...oud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference.png b/...oud.android.ui.activity.ContactsPreferenceActivityIT_openContactsPreference.png
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java