summaryrefslogtreecommitdiffstats
path: root/lib/util.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-26 14:21:06 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-26 14:21:06 +0100
commitd4d09b06f80462394983fe04d291a0345dd57280 (patch)
treee4452055533c7ec7bb6fa49ac7f6b5c93ba8c4f7 /lib/util.php
parentea8f71a19c59e7138d4a504bacc0beb410fc77e8 (diff)
parent3d0d47957e65a72e17d33a924c9c4efcd5088ed2 (diff)
downloadnextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.tar.gz
nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.zip
merge 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 2fd1dd543d6..fa5b3daaab6 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,2);
+ return array(3,00,3);
}
/**