]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1d2417 05ab9d2)
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Tue, 23 Apr 2013 12:13:40 +0000 (14:13 +0200)
committerSam Tuke <samtuke@owncloud.com>
Tue, 23 Apr 2013 12:13:40 +0000 (14:13 +0200)
1  2 
lib/public/share.php patch | diff1 | diff2 | blob | history

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