]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0be2c7 d124b69)
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)
Conflicts:
lib/appframework/http/request.php
tests/lib/appframework/http/RequestTest.php


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server