diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-08-26 18:04:49 +0200 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-08-26 18:04:49 +0200 |
| commit | 7d141656ee837199f58d6a29033ded7d5c2a4632 (patch) | |
| tree | c465375f531b8924acd70abc49b60bbcbf1e4d14 /apps/files/tests | |
| parent | 29c28a45cacebfcca7df7577334e76da001f2eb1 (diff) | |
| parent | 881e362f932bfd2d3b5daddd83545d09bda16e40 (diff) | |
| download | nextcloud-server-7d141656ee837199f58d6a29033ded7d5c2a4632.tar.gz nextcloud-server-7d141656ee837199f58d6a29033ded7d5c2a4632.zip | |
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
Conflicts:
lib/helper.php
Diffstat (limited to 'apps/files/tests')
0 files changed, 0 insertions, 0 deletions