]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fcd765 e30220e)
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Wed, 28 Sep 2011 09:52:13 +0000 (11:52 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Wed, 28 Sep 2011 09:52:13 +0000 (11:52 +0200)
1  2 
lib/util.php patch | diff1 | diff2 | blob | history

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