Merge branch 'convquicksy286' into 'master'

Conversations/Quicksy - 2.8.6

See merge request fdroid/fdroiddata!6901

metadata/eu.siacs.conversations.yml

@@ -1842,11 +1842,21 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
     ndk: r21b
 
+  - versionName: 2.8.6+fcr
+    versionCode: 390
+    commit: 2.8.6
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21b
+
 MaintainerNotes: |-
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
     that won't be updated anymore so we'll need to start building locally in the future.
 
 AutoUpdateMode: Version ++fcr %v
 UpdateCheckMode: Tags
-CurrentVersion: 2.8.5+fcr
-CurrentVersionCode: 388
+CurrentVersion: 2.8.6+fcr
+CurrentVersionCode: 390

metadata/im.quicksy.client.yml

@@ -340,7 +340,17 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
     ndk: r21b
 
+  - versionName: 2.8.6+fcr
+    versionCode: 390
+    commit: 2.8.6
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21b
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.8.5+fcr
-CurrentVersionCode: 388
+CurrentVersion: 2.8.6+fcr
+CurrentVersionCode: 390