diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 16:44:06 +0100 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 16:44:06 +0100 |
commit | 1065c3354326149022eaffe50c86c94ac226b620 (patch) | |
tree | 4a8f2ec09539d07bba84bfc73995fbbfcd220453 /core/templates/login.php | |
parent | 060e0ad0cd668529f13a97b866a371e505e8fa3e (diff) | |
parent | 40231c08cf617b5909dee778372d6b1b8cdd5bcf (diff) | |
download | nextcloud-server-1065c3354326149022eaffe50c86c94ac226b620.tar.gz nextcloud-server-1065c3354326149022eaffe50c86c94ac226b620.zip |
Merge branch 'master' into encryption_initial_enc_indicator
Diffstat (limited to 'core/templates/login.php')
0 files changed, 0 insertions, 0 deletions