diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-05 21:54:32 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-05 21:54:32 -0500 |
| commit | 4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5 (patch) | |
| tree | 59113a180157e2037f3c127489e735bba173ccd6 /ocs | |
| parent | ee0c38bb5112af4aa491b526ca390de52dd3ab7e (diff) | |
| parent | c1a32b50735b0a8558823d111e546865ddcba790 (diff) | |
| download | nextcloud-server-4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5.tar.gz nextcloud-server-4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/appinfo/app.php
Diffstat (limited to 'ocs')
0 files changed, 0 insertions, 0 deletions