summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-02-24 18:51:38 +0100
committerGeorg Ehrke <dev@georgswebsite.de>2012-02-24 18:51:38 +0100
commite082d473bb856bdaf48290199bf5d2f1fb4a435d (patch)
treec7da3321716dc0ec38682f1881ae8d2bbae84308 /lib
parenteae32e05c9feb742b51bd70c7f3fa2270191f719 (diff)
parentca874a3ad776c9fd22c7bcbad81f493cfc551661 (diff)
downloadnextcloud-server-e082d473bb856bdaf48290199bf5d2f1fb4a435d.tar.gz
nextcloud-server-e082d473bb856bdaf48290199bf5d2f1fb4a435d.zip
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 1b1e29b6749..05caeca0e3e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ class OC_Util {
* @return array
*/
public static function getVersion(){
- return array(3,00,1);
+ return array(3,00,2);
}
/**