]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b513a60 6d54022)
Merge branch 'master' of git.kde.org:owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 6 Aug 2011 21:19:40 +0000 (23:19 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 6 Aug 2011 21:19:40 +0000 (23:19 +0200)
1  2 
lib/base.php patch | diff1 | diff2 | blob | history

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