diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-18 17:31:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 17:31:29 +0100 |
| commit | 533e59f1d5411d6ef502ea7ca551e7e6c9facd67 (patch) | |
| tree | 41fb9b932e7f9205e70d56c670a9aa8f9af0c51e | |
| parent | 49aa99de7fbaed38cd42dbf09aa06965bb805dd0 (diff) | |
| parent | 4b707b551210f5b34b6ab8f4d128190eac86d17d (diff) | |
| download | nextcloud-server-533e59f1d5411d6ef502ea7ca551e7e6c9facd67.tar.gz nextcloud-server-533e59f1d5411d6ef502ea7ca551e7e6c9facd67.zip | |
Merge pull request #7937 from nextcloud/12.0.5-rc2-prepv12.0.5RC2
12.0.5 RC2
| -rw-r--r-- | version.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/version.php b/version.php index 5cdbe37ff0b..c1ffbffddc7 100644 --- a/version.php +++ b/version.php @@ -26,10 +26,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(12, 0, 5, 0); +$OC_Version = array(12, 0, 5, 1); // The human readable string -$OC_VersionString = '12.0.5 RC1'; +$OC_VersionString = '12.0.5 RC2'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ @@ -41,7 +41,8 @@ $OC_VersionCanBeUpgradedFrom = [ '10.0.1.5' => true, '10.0.2.1' => true, '10.0.3.3' => true, - '10.0.4' => true, // TODO adjust to 4 digits once it is final + '10.0.4.4' => true, + '10.0.5' => true, // TODO adjust to 4 digits once it is final ], ]; |