summaryrefslogtreecommitdiffstats
path: root/lib/util.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-25 16:36:58 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-25 16:36:58 +0100
commitea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch)
tree5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /lib/util.php
parent814bc2fd2bef739938716ae840a4db0de502422a (diff)
parent8b93a9a237603185501d0e24e9c08705168fc553 (diff)
downloadnextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.tar.gz
nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.zip
Merge branch 'master' into encryption
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 18a5db3e4ee..2fd1dd543d6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -66,7 +66,7 @@ class OC_Util {
* @return array
*/
public static function getVersion(){
- return array(3,00,1);
+ return array(3,00,2);
}
/**