From 556a14f283222c46bd72fb0cf53743935fa4d4cc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 14 Dec 2020 15:36:19 +0100 Subject: [PATCH 1/2] 20.0.4 Signed-off-by: Roeland Jago Douma --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 531e9be04c..58c2a7bbaa 100644 --- a/version.php +++ b/version.php @@ -29,10 +29,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [20, 0, 3, 2]; +$OC_Version = [20, 0, 4, 0]; // The human readable string -$OC_VersionString = '20.0.3'; +$OC_VersionString = '20.0.4'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ From 176a07895b9e402df979d0a065fa233aafbfe813 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 14 Dec 2020 15:54:56 +0100 Subject: [PATCH 2/2] Bump bundle Signed-off-by: Roeland Jago Douma --- resources/config/ca-bundle.crt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt index 7ecd42f825..3a08fd8db4 100644 --- a/resources/config/ca-bundle.crt +++ b/resources/config/ca-bundle.crt @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Oct 14 03:12:15 2020 GMT +## Certificate data from Mozilla as of: Tue Dec 8 04:12:05 2020 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.28. -## SHA256: a831d3bc63ba1f65478afe28038742b7150c0c2efd243ac342b64792a75d2038 +## SHA256: d820b8696d8ffe42064a1384a56a8981cdc7e7e198036bbb5fa04a6c282dd9a2 ##