]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
authorThomas Tanghus <thomas@tanghus.net>
Mon, 30 Sep 2013 14:27:00 +0000 (16:27 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 30 Sep 2013 14:27:00 +0000 (16:27 +0200)
commit4e9a95f3e9fcf3336019de1e1e4963ed91206065
treeb1bf06032818c36c582bc52f52f5dd54e954fc2a
parentb0be2c79dce5b1b7da43cc33462c4fe2a981e932
parentd124b6965b4ed9aed03396d97bc148038148372b
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request

Conflicts:
lib/appframework/http/request.php
tests/lib/appframework/http/RequestTest.php