Merge branch 'conv260' into 'master'

Conversations/Quicksy 2.6.0

See merge request fdroid/fdroiddata!5911

metadata/eu.siacs.conversations.yml

@@ -1788,11 +1788,19 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
+  - versionName: 2.6.0+fcr
+    versionCode: 349
+    commit: 2.6.0
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
+        \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
 MaintainerNotes: |-
     We go back to targetSdk 25 so users can disable the foreground service (and
     annoying notification) if they choose to.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.5.12+fcr
+CurrentVersion: 2.6.0+fcr
-CurrentVersionCode: 346
+CurrentVersionCode: 349

metadata/im.quicksy.client.yml

@@ -237,7 +237,15 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
+  - versionName: 2.6.0+fcr
+    versionCode: 349
+    commit: 2.6.0
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
+        \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.5.12+fcr
+CurrentVersion: 2.6.0+fcr
-CurrentVersionCode: 346
+CurrentVersionCode: 349