diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-12-13 01:38:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 01:38:17 +0300 |
| commit | cb8a8446b97baa0dab8cf71847b5e90d0d6b5e9b (patch) | |
| tree | 51d6ee0b8a54728de7fd22bf83c2974e94af5c82 | |
| parent | 97914425099732c5b69d10c1ea2d43cbfd22a063 (diff) | |
| parent | 8bb0b8d5ce06ac887eba4b5e482f8f85ff4a7614 (diff) | |
Merge pull request #18346 from nextcloud/version/15.0.14/rc1v15.0.14RC1
15.0.14 RC1
| -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 edc5090c755..7ad01f31e69 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 16 03:12:09 2019 GMT +## Certificate data from Mozilla as of: Wed Nov 27 04:12:10 2019 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.27. -## SHA256: c979c6f35714a0fedb17d9e5ba37adecbbc91a8faf4186b4e23d6f9ca44fd6cb +## SHA256: 607309057d0ec70f8e4e97b03906bafb2fcebb24cd37b5e8293e681ae26ceae0 ## diff --git a/version.php b/version.php index 8626dbda7da..e8f8f4db785 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(15, 0, 13, 1); +$OC_Version = array(15, 0, 14, 0); // The human readable string -$OC_VersionString = '15.0.13'; +$OC_VersionString = '15.0.14 RC1'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |