]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dddcae 5a309c1)
Merge branch 'master' into clean-app-id
authorThomas Müller <thomas.mueller@tmit.eu>
Sat, 9 Feb 2013 16:28:30 +0000 (17:28 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Sat, 9 Feb 2013 16:28:30 +0000 (17:28 +0100)
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