Skip to content

Commit

Permalink
Merge pull request #218 from owncloud/savre-3.0
Browse files Browse the repository at this point in the history
Updating sabre/dav to 3.0.5 - including dependencies
  • Loading branch information
DeepDiver1975 committed Nov 24, 2015
2 parents d24fd87 + b9dd016 commit 77d15ce
Show file tree
Hide file tree
Showing 303 changed files with 16,056 additions and 7,652 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ patchwork/jsqueeze/phpunit.xml.dist

sabre/dav/examples
sabre/dav/tests
sabre/event/tests
sabre/http/examples
sabre/http/tests
sabre/uri/tests
sabre/vobject/tests
sabre/xml/tests

mcnetic/zipstreamer/tests

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"classmap-authoritative": true
},
"require": {
"sabre/dav" : "2.1.7",
"doctrine/dbal": "2.5.2",
"mcnetic/zipstreamer": "v0.7",
"phpseclib/phpseclib": "2.0.0",
Expand Down Expand Up @@ -36,6 +35,7 @@
"interfasys/lognormalizer": "dev-master@dev",
"deepdiver1975/TarStreamer": "v0.1-beta3",
"patchwork/jsqueeze": "^2.0",
"kriswallsmith/assetic": "1.3.1"
"kriswallsmith/assetic": "1.3.1",
"sabre/dav": "^3.0"
}
}
156 changes: 136 additions & 20 deletions composer.lock

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

Loading

0 comments on commit 77d15ce

Please sign in to comment.