diff options
| author | raghunayyar <me@iraghu.com> | 2014-02-19 21:23:29 +0530 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 12:53:52 +0200 |
| commit | 9ba4a7621446433fcf5eed2569473984753141a0 (patch) | |
| tree | 875d7e4ffe5c90bbd82913c0b5614443ca73137b /db_structure.xml | |
| parent | bf88bd108e5acc9257428f7ff6d727f157b58450 (diff) | |
| download | nextcloud-server-9ba4a7621446433fcf5eed2569473984753141a0.tar.gz nextcloud-server-9ba4a7621446433fcf5eed2569473984753141a0.zip | |
resolving conflict when picking 8b81a0b
Diffstat (limited to 'db_structure.xml')
0 files changed, 0 insertions, 0 deletions