diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-02 16:41:46 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-02 16:41:46 +0400 |
| commit | b918c06be60eea9edde26b05621898627c71130d (patch) | |
| tree | f16cbad18677ee2f3262474f5668603adf52896e /db_structure.xml | |
| parent | 4bbefdf608fdf930fa6fd1f783d6f58267752394 (diff) | |
| parent | 06870a6e390f68d741893b4454b8fe4063404ca8 (diff) | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/util.php
Diffstat (limited to 'db_structure.xml')
| -rw-r--r-- | db_structure.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/db_structure.xml b/db_structure.xml index f782a5e7708..d0fa91211fe 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -383,7 +383,7 @@ <name>user</name> <type>text</type> <default></default> - <notnull>true</notnull> + <notnull>false</notnull> <length>64</length> </field> @@ -397,8 +397,6 @@ <index> <name>id_user_index</name> - <unique>true</unique> - <primary>true</primary> <field> <name>fileid</name> <sorting>ascending</sorting> |