Merge branch 'linphone421' into 'master'

Linphone 4.2.1

Closes #1936 and #1937

See merge request fdroid/fdroiddata!6286

metadata/org.linphone.yml

@@ -563,10 +563,9 @@ Builds:
         linphone-sdk-android/
     ndk: r16b
 
-  - versionName: 4.2.0
-    versionCode: 4213
-    disable: to force buildserver to retry next next cycle
-    commit: '4.2'
+  - versionName: 4.2.1
+    versionCode: 4215
+    commit: 4.2.1
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y --no-install-recommends cmake -t stretch-backports
@@ -608,5 +607,5 @@ MaintainerNotes: Main repo for linphone-sdk is upstreams private Gitlab instance
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 4.2.0
-CurrentVersionCode: 4213
+CurrentVersion: 4.2.1
+CurrentVersionCode: 4215