]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58a8d67 71668cf)
Merge branch 'master' into files_encryption
authorFlorin Peter <github@florin-peter.de>
Mon, 20 May 2013 00:25:56 +0000 (02:25 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 20 May 2013 00:25:56 +0000 (02:25 +0200)
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