]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into csrf-on-login-and-logout
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 18:40:55 +0000 (20:40 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 19 May 2014 18:40:55 +0000 (20:40 +0200)
commitf8cb8f480346fb36ca18258b902a7157265c8ac7
tree6445753bb12ad5d050d6397364ddd61c035ad0e8
parente1e1009ccc304f6e527c3cc392b510f6d8868533
parentb6d2d6329d99c47fa8a01a7a8db7f8f2de6b9f74
Merge branch 'master' into csrf-on-login-and-logout

Conflicts:
core/templates/login.php
core/templates/login.php
lib/base.php
lib/private/user.php