Skip to content

Commit

Permalink
Merge pull request #29149 from owncloud/stable10-1cec6aab4e01c5b58fe4…
Browse files Browse the repository at this point in the history
…1fc45771df720abb3f24

[stable10] Switch to deepdiver/zipstreamer 1.1.0 which fixes
  • Loading branch information
DeepDiver1975 authored Oct 6, 2017
2 parents 8988556 + e2e0002 commit 46b3ec6
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 56 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"require": {
"php": ">=5.4.1",
"doctrine/dbal": "^2.5",
"mcnetic/zipstreamer": "^1.0",
"phpseclib/phpseclib": "2.0.3",
"phpseclib/phpseclib": "^2.0",
"rackspace/php-opencloud": "v1.9.2",
"jeremeamia/superclosure": "2.1.0",
"bantu/ini-get-wrapper": "v1.0.1",
Expand All @@ -55,6 +54,7 @@
"patchwork/jsqueeze": "^2.0",
"symfony/polyfill-php70": "^1.0",
"lukasreschke/id3parser": "^0.0.1",
"sabre/dav": "^3.2"
"sabre/dav": "^3.2",
"deepdiver/zipstreamer": "^1.1"
}
}
114 changes: 61 additions & 53 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 46b3ec6

Please sign in to comment.