summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-10 21:08:11 +0200
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-10 21:08:11 +0200
commit4cbae823eb742fac80288c6c74acba26e0a9c5d6 (patch)
tree0c7dbfb10645732ceb385018256a1524b2d29b89 /lib
parentdeaeab3d92ed8f536789a142828549957130dc1c (diff)
parent6163351ea234cca9ee09d4f040c5cb45e1caf481 (diff)
downloadnextcloud-server-4cbae823eb742fac80288c6c74acba26e0a9c5d6.tar.gz
nextcloud-server-4cbae823eb742fac80288c6c74acba26e0a9c5d6.zip
Merge branch 'master' into calendar
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index f8748e868c1..4920d13914d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -90,7 +90,7 @@ class OC_Util {
* @return array
*/
public static function getVersion(){
- return array(1,92,0);
+ return array(2,90,0);
}
/**
@@ -98,7 +98,7 @@ class OC_Util {
* @return string
*/
public static function getVersionString(){
- return '2 beta 3';
+ return '3 alpha 1';
}
/**