]> source.dussan.org Git - nextcloud-server.git/commit
Merge master into ocs_api, fix conflicts.
authorTom Needham <needham.thomas@gmail.com>
Fri, 14 Dec 2012 15:15:05 +0000 (15:15 +0000)
committerTom Needham <needham.thomas@gmail.com>
Fri, 14 Dec 2012 15:15:05 +0000 (15:15 +0000)
commit5fe61296981343a3f877618aeecfc33ea7fed3c1
tree919ea533c8d98f71f7c77d534eb0595207d22a17
parent4facd766e3712d4c714f2e1bf2ad4be41461a7cc
parentf0893fb8fe7f0642ae30de2e1168472377c127e2
Merge master into ocs_api, fix conflicts.
lib/app.php
lib/ocs.php
lib/router.php
ocs/v1.php