]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b916719 c7ca867)
Merge branch 'master' into fileapi-foreward
authorRobin Appelman <icewind@owncloud.com>
Thu, 12 Sep 2013 19:43:35 +0000 (21:43 +0200)
committerRobin Appelman <icewind@owncloud.com>
Thu, 12 Sep 2013 19:43:35 +0000 (21:43 +0200)
1  2 
lib/files/view.php patch | diff1 | diff2 | blob | history

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