Merge pull request #21700 from nextcloud/version/18.0.7/RC1

18.0.7 RC1
nextcloud · Jul 9, 2020 · 9661e73 · 9661e73
2 parents 637fc70 + dde7908
commit 9661e73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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 Jan  1 04:12:10 2020 GMT
+## Certificate data from Mozilla as of: Wed Jun 24 03:12:10 2020 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -13,8 +13,8 @@
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70
+## Conversion done with mk-ca-bundle.pl version 1.28.
+## SHA256: 5796295533cad5a648a20a115b0894dc9b318c41501796e7158e824c323f11c3
 ##
 
 

diff --git 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 = array(18, 0, 6, 0);
+$OC_Version = array(18, 0, 7, 0);
 
 // The human readable string
-$OC_VersionString = '18.0.6';
+$OC_VersionString = '18.0.7 RC1';
 
 $OC_VersionCanBeUpgradedFrom = [
 	'nextcloud' => [