summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2012-09-19 14:08:17 +0200
committerBjörn Schießle <schiessle@owncloud.com>2012-09-19 14:08:17 +0200
commite5de1067ae9d13b070e4f619caadbbec4bb671cc (patch)
treebf5476bb5fa529f455954c5c3a12dd088c2b5cd1
parent223bf3e47cbcb5ed6f7353b7dc5737b6d28452b7 (diff)
parent93d0defe9a5f170557336008b35d957a7a730e26 (diff)
downloadnextcloud-server-e5de1067ae9d13b070e4f619caadbbec4bb671cc.tar.gz
nextcloud-server-e5de1067ae9d13b070e4f619caadbbec4bb671cc.zip
Merge branch 'master' of github.com:owncloud/core
-rw-r--r--db_structure.xml3
-rwxr-xr-xlib/util.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/db_structure.xml b/db_structure.xml
index 74e2805308a..d9b58f22ec7 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -31,9 +31,8 @@
<field>
<name>configvalue</name>
- <type>text</type>
+ <type>clob</type>
<notnull>true</notnull>
- <length>255</length>
</field>
diff --git a/lib/util.php b/lib/util.php
index 5e39fd1f914..e07137c8e8f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ class OC_Util {
*/
public static function getVersion() {
// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
- return array(4,84,7);
+ return array(4,84,8);
}
/**