]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso...
authorMorris Jobke <morris.jobke@gmail.com>
Mon, 26 Aug 2013 16:04:49 +0000 (18:04 +0200)
committerMorris Jobke <morris.jobke@gmail.com>
Mon, 26 Aug 2013 16:04:49 +0000 (18:04 +0200)
commit7d141656ee837199f58d6a29033ded7d5c2a4632
treec465375f531b8924acd70abc49b60bbcbf1e4d14
parent29c28a45cacebfcca7df7577334e76da001f2eb1
parent881e362f932bfd2d3b5daddd83545d09bda16e40
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
lib/helper.php