]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c328640 2123ef5)
Merge branch 'master' into fixing-appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 8 Oct 2013 10:13:24 +0000 (12:13 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 8 Oct 2013 10:13:24 +0000 (12:13 +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