summaryrefslogtreecommitdiffstats
path: root/lib/util.php
diff options
context:
space:
mode:
authorJakob Sack <kde@jakobsack.de>2011-07-29 20:42:24 +0200
committerJakob Sack <kde@jakobsack.de>2011-07-29 20:42:24 +0200
commit2bfad189e7e9c8ea78e4b5f78c9e779074dd991c (patch)
tree697204517c95647e382a4723545ade3950420913 /lib/util.php
parente69079f9354464d21f31ae8b6d9e47988ba22fb4 (diff)
parentd12d08e2f3553b06df6371535f971c9f193bd388 (diff)
downloadnextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.tar.gz
nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.zip
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts: lib/base.php lib/filestorage.php
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index 8beb4a884bc..2a50114b053 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -82,7 +82,7 @@ class OC_UTIL {
* @return array
*/
public static function getVersion(){
- return array(1,60,0);
+ return array(1,90,0);
}
/**
@@ -242,4 +242,3 @@ class OC_UTIL {
return $errors;
}
}
-