Skip to content
Commit 4e9a95f3 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request 

Conflicts:
	lib/appframework/http/request.php
	tests/lib/appframework/http/RequestTest.php
parents b0be2c79 d124b696
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment