diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
| commit | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (patch) | |
| tree | 7868026ba14b6558c8e50b601a9a5fa85fdc585b /db_structure.xml | |
| parent | f8563ec5831713b341db1b2cd480328912818607 (diff) | |
| parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
| download | nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.tar.gz nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
Diffstat (limited to 'db_structure.xml')
0 files changed, 0 insertions, 0 deletions