Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-07-18 10:37:11 +0300
committerGitHub <noreply@github.com>2017-07-18 10:37:11 +0300
commit40abc3a18a220f6b988e6609c6b62209e4a9a247 (patch)
tree78fb18d9eb00f45fb8c01ad737b4ddce94c1966c
parent595270f846cb79f1994e9cafe254f86e90e42fd6 (diff)
parentce3c277e43826fc53f636f6e2d3175cb1bd91c2f (diff)
Merge pull request #5727 from nextcloud/bump-stable11-versionv11.0.4RC1
11.0.4RC1
-rw-r--r--tests/lib/App/AppStore/Fetcher/AppFetcherTest.php2
-rw-r--r--version.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
index 7fbbde722e7..2eb583f98d6 100644
--- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -114,7 +114,7 @@ EOD;
$client
->expects($this->once())
->method('get')
- ->with('https://apps.nextcloud.com/api/v1/platform/11.0.3/apps.json')
+ ->with('https://apps.nextcloud.com/api/v1/platform/'.substr(implode('.', \OC_Util::getVersion()), 0, 6).'/apps.json')
->willReturn($response);
$response
->expects($this->once())
diff --git a/version.php b/version.php
index 3701df0f518..fd668f2456c 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(11, 0, 3, 2);
+$OC_Version = array(11, 0, 4, 0);
// The human readable string
-$OC_VersionString = '11.0.3';
+$OC_VersionString = '11.0.4 RC1';
$OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [