diff options
author | Florin Peter <github@florin-peter.de> | 2013-05-22 01:22:36 +0200 |
---|---|---|
committer | Florin Peter <github@florin-peter.de> | 2013-05-22 01:26:35 +0200 |
commit | 28d72b822deadd9d4e510eefd3a0f76ebdf236ec (patch) | |
tree | c1bf37663599006776656e618475370a3578c3b1 /db_structure.xml | |
parent | afbfa742d7848089523262f5c234035db1b20d3b (diff) | |
parent | e2444ec9c5a7c36f7cfaa200387fb8d16e5dedb1 (diff) | |
download | nextcloud-server-28d72b822deadd9d4e510eefd3a0f76ebdf236ec.tar.gz nextcloud-server-28d72b822deadd9d4e510eefd3a0f76ebdf236ec.zip |
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Diffstat (limited to 'db_structure.xml')
-rw-r--r-- | db_structure.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/db_structure.xml b/db_structure.xml index 366f51a82d0..a902374e01f 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -281,6 +281,14 @@ </field> <field> + <name>storage_mtime</name> + <type>integer</type> + <default></default> + <notnull>true</notnull> + <length>4</length> + </field> + + <field> <name>encrypted</name> <type>integer</type> <default>0</default> |