diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-07-09 22:36:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 22:36:30 +0300 |
| commit | 9661e73ef589cef976e7b4d214d1f71451b8219f (patch) | |
| tree | 541613fc461519eb6f5b400f611a28a7ffb77724 | |
| parent | 637fc70c8148e19286b35e80e7f4a5ec6b6a50c1 (diff) | |
| parent | dde7908e8a23f7b77e7afc82c5007fdb79651fd8 (diff) | |
Merge pull request #21700 from nextcloud/version/18.0.7/RC1v18.0.7RC1
18.0.7 RC1
| -rw-r--r-- | resources/config/ca-bundle.crt | 6 | ||||
| -rw-r--r-- | version.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt index 651694e8a3a..eb8b0baccd2 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 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 index 66fdf9ef0c8..debf01c54ca 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 = 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' => [ |