]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fe9245 0c6213a)
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Sat, 5 Jan 2013 17:22:01 +0000 (17:22 +0000)
committerSam Tuke <samtuke@owncloud.com>
Sat, 5 Jan 2013 17:22:01 +0000 (17:22 +0000)
1  2 
lib/filestorage/local.php patch | diff1 | diff2 | blob | history

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