]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 206f839 3b25bab)
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Sep 2013 21:15:17 +0000 (23:15 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Sep 2013 21:15:17 +0000 (23:15 +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