Merge pull request #24693 from nextcloud/version/20.0.4/final

20.0.4
This commit is contained in:
Roeland Jago Douma 2020-12-14 19:40:45 +01:00 committed by GitHub
commit d50e8d85c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
## ##
## Bundle of CA Root Certificates ## 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 ## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates ## (CA). These were automatically extracted from Mozilla's root certificates
@ -14,7 +14,7 @@
## Just configure this file as the SSLCACertificateFile. ## Just configure this file as the SSLCACertificateFile.
## ##
## Conversion done with mk-ca-bundle.pl version 1.28. ## Conversion done with mk-ca-bundle.pl version 1.28.
## SHA256: a831d3bc63ba1f65478afe28038742b7150c0c2efd243ac342b64792a75d2038 ## SHA256: d820b8696d8ffe42064a1384a56a8981cdc7e7e198036bbb5fa04a6c282dd9a2
## ##

View File

@ -29,10 +29,10 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number. // when updating major/minor version number.
$OC_Version = [20, 0, 3, 2]; $OC_Version = [20, 0, 4, 0];
// The human readable string // The human readable string
$OC_VersionString = '20.0.3'; $OC_VersionString = '20.0.4';
$OC_VersionCanBeUpgradedFrom = [ $OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [ 'nextcloud' => [