]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: feeb0c7 dc64194)
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
authorThomas Tanghus <thomas@tanghus.net>
Fri, 16 Dec 2011 16:43:06 +0000 (17:43 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Fri, 16 Dec 2011 16:43:06 +0000 (17:43 +0100)
1  2 
index.php patch | diff1 | diff2 | blob | history

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