summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-10-10 20:57:15 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-10-10 20:57:15 +0200
commit8b3c4e9a5206ff6e6f02a8a919863c6525a1910b (patch)
tree74140b3669afc25069c139af22435d0451aa819e /lib
parent949494ccfd89d7ff4af26d8da83475e2ee382f73 (diff)
parent6163351ea234cca9ee09d4f040c5cb45e1caf481 (diff)
downloadnextcloud-server-8b3c4e9a5206ff6e6f02a8a919863c6525a1910b.tar.gz
nextcloud-server-8b3c4e9a5206ff6e6f02a8a919863c6525a1910b.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
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';
}
/**