]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db77dc9 a6ff909)
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 13:56:15 +0000 (15:56 +0200)
committerFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 13:56:15 +0000 (15:56 +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