summaryrefslogtreecommitdiffstats
path: root/lib/util.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-01-30 20:29:33 +0100
committerRobin Appelman <icewind@owncloud.com>2012-01-30 20:29:33 +0100
commit4522d19b4c214676b8a0d4067c3a2d1bc63618bc (patch)
tree68725926f48072805e321f3507237df33814472a /lib/util.php
parent355262635838860f5f17b2cf20132adddd7af77e (diff)
parent45038af948cd07ffc74efc8d4b0282fa11b7de7e (diff)
downloadnextcloud-server-4522d19b4c214676b8a0d4067c3a2d1bc63618bc.tar.gz
nextcloud-server-4522d19b4c214676b8a0d4067c3a2d1bc63618bc.zip
merge master into filesystem
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index 454f5d04457..6c19c5416a2 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
* @return array
*/
public static function getVersion(){
- return array(2,90,1);
+ return array(3,00,1);
}
/**
@@ -70,7 +70,7 @@ class OC_Util {
* @return string
*/
public static function getVersionString(){
- return '3 alpha 1';
+ return '3';
}
/**