diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-23 20:08:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 20:08:32 +0100 |
| commit | 07f607e1487fccfc955cf68b7538b7e3f2c078e3 (patch) | |
| tree | 3e184244471a21a2b2b0fd7209a9bf105f30fbde | |
| parent | 4cc85805d6379e673d7a2e51df2950df938afde0 (diff) | |
| parent | be7d582c7e6f76255d8d2c5b63943025c99e9432 (diff) | |
| download | nextcloud-server-07f607e1487fccfc955cf68b7538b7e3f2c078e3.tar.gz nextcloud-server-07f607e1487fccfc955cf68b7538b7e3f2c078e3.zip | |
Merge pull request #24765 from nextcloud/version/21/beta3v21.0.0beta3
21 beta3
| -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 ace58a39e4e..989c66306d8 100644 --- a/version.php +++ b/version.php @@ -30,10 +30,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [21, 0, 0, 9]; +$OC_Version = [21, 0, 0, 10]; // The human readable string -$OC_VersionString = '21.0.0 beta2'; +$OC_VersionString = '21.0.0 beta3'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |