diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-14 21:40:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 21:40:45 +0300 |
| commit | d50e8d85c712991702894e80811c861df4262bbe (patch) | |
| tree | 1b7f37115f105a907fe1650ba794245696880142 | |
| parent | 24fe3ee4391fc06c005a43455cf650b1813904d7 (diff) | |
| parent | 176a07895b9e402df979d0a065fa233aafbfe813 (diff) | |
Merge pull request #24693 from nextcloud/version/20.0.4/finalv20.0.4
20.0.4
| -rw-r--r-- | resources/config/ca-bundle.crt | 4 | ||||
| -rw-r--r-- | version.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt index 7ecd42f8258..3a08fd8db49 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 ## diff --git a/version.php b/version.php index 531e9be04ca..58c2a7bbaa2 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' => [ |