Merge branch 'conv284' into 'master'

Conversations/Quicksy - 2.8.4

See merge request fdroid/fdroiddata!6816

metadata/eu.siacs.conversations.yml

@@ -1822,6 +1822,15 @@ Builds:
         false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
         -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
 
+  - versionName: 2.8.4+fcr
+    versionCode: 387
+    commit: 2.8.4
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
+        false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
+        -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+
 MaintainerNotes: |-
     We go back to targetSdk 25 so users can disable the foreground service (and
     annoying notification) if they choose to.
@@ -1830,5 +1839,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: Version ++fcr %v
 UpdateCheckMode: Tags
-CurrentVersion: 2.8.3+fcr
-CurrentVersionCode: 383
+CurrentVersion: 2.8.4+fcr
+CurrentVersionCode: 387

metadata/im.quicksy.client.yml

@@ -320,7 +320,16 @@ Builds:
         false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
         -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
 
+  - versionName: 2.8.4+fcr
+    versionCode: 387
+    commit: 2.8.4
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
+        false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
+        -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.8.3+fcr
-CurrentVersionCode: 383
+CurrentVersion: 2.8.4+fcr
+CurrentVersionCode: 387