Merge pull request #10792 from nextcloud/version/noid/12.0.11RC1

12.0.11 RC 1
This commit is contained in:
Morris Jobke 2018-08-24 10:47:46 +02:00 committed by GitHub
commit 6775889682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -377,7 +377,7 @@ class ClassLoader
$subPath = $class; $subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) { while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos); $subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\'; $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) { if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) { foreach ($this->prefixDirsPsr4[$search] as $dir) {

View File

@ -26,10 +26,10 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number. // when updating major/minor version number.
$OC_Version = array(12, 0, 10, 1); $OC_Version = array(12, 0, 11, 0);
// The human readable string // The human readable string
$OC_VersionString = '12.0.10'; $OC_VersionString = '12.0.11 RC 1';
$OC_VersionCanBeUpgradedFrom = [ $OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [ 'nextcloud' => [