]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4687f50 afdad5c)
Merge branch 'master' into move-maint-start
authorMichael Gapczynski <mtgap@owncloud.com>
Tue, 21 May 2013 15:26:56 +0000 (11:26 -0400)
committerMichael Gapczynski <mtgap@owncloud.com>
Tue, 21 May 2013 15:26:56 +0000 (11:26 -0400)
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