]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 085fdfe 7c6246f)
Merge branch 'master' into fixing-testGetById-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 29 Jul 2013 22:37:05 +0000 (00:37 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 29 Jul 2013 22:37:05 +0000 (00:37 +0200)
1  2 
lib/util.php patch | diff1 | diff2 | blob | history

diff --cc lib/util.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server