]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c74029 5112295)
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
authorJakob Sack <kde@jakobsack.de>
Sat, 16 Apr 2011 12:59:27 +0000 (14:59 +0200)
committerJakob Sack <kde@jakobsack.de>
Sat, 16 Apr 2011 12:59:27 +0000 (14:59 +0200)
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