]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit31037241e11122203f2ea73b6c1b126a14bfdae2
treec783857d7a61c48d913a252fb05e99e6389fb937
parent58a8d67a9b3c48567bcc40cc02444311c6773275
parent71668cf08a57742c0a585c9e2fe7e4bb0ea08165
Merge branch 'master' into files_encryption
lib/user.php