]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2de5a3 9e4d138)
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_m...
authorThomas Tanghus <thomas@tanghus.net>
Mon, 23 Sep 2013 22:09:21 +0000 (00:09 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 23 Sep 2013 22:09:21 +0000 (00:09 +0200)
commit698394c994a79aa4faa53c2d69e9937d798d8948
treea78c672623bf596062a50f764d081b1f60ed384ftree | snapshot
parentf2de5a34eff78add366b7a89c93a8128a097996fcommit | diff
parent9e4d13858c92e3b42e99152cee7b899a7ddb926bcommit | diff
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
lib/public/iservercontainer.php
lib/server.php
lib/public/iservercontainer.php diff1 | diff2 | blob | history
lib/server.php diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server