]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0124809 6583d30)
Merge branch 'master' into filesystem
authorRobin Appelman <icewind@owncloud.com>
Wed, 1 Feb 2012 14:57:32 +0000 (15:57 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 1 Feb 2012 14:57:32 +0000 (15:57 +0100)
1  2 
settings/personal.php patch | diff1 | diff2 | blob | history

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