]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6082a06 6156d71)
Merge branch 'master' into oc_preview
authorGeorg Ehrke <georg@ownCloud.com>
Mon, 17 Jun 2013 10:31:02 +0000 (12:31 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Mon, 17 Jun 2013 10:31:02 +0000 (12:31 +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