]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)
1  2 
lib/user.php
lib/user/session.php

diff --cc lib/user.php
Simple merge
Simple merge