]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f58ed7a 58e5715)
Merge branch 'master' into fixing-1424-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Mon, 11 Feb 2013 20:42:27 +0000 (21:42 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Mon, 11 Feb 2013 20:42:27 +0000 (21:42 +0100)
1  2 
lib/user.php patch | diff1 | diff2 | blob | history

diff --cc lib/user.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server