diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
| commit | 8b08b1b455b474de3fa376dfafa3de63727364ea (patch) | |
| tree | 536b2d4ba4f979d69f4f6e73755e06635345f78a /core/templates | |
| parent | 084f76fd14125023d5b7277c558eb86a20ea07d3 (diff) | |
| parent | 535ed8369f701a184340a428e82cc8d7cc7588bb (diff) | |
| download | nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/login.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index ee761f0aa52..06f64d41e39 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -32,9 +32,10 @@ <?php p($l->t('Lost your password?')); ?> </a> <?php endif; ?> - + <?php if ($_['rememberLoginAllowed'] === true) : ?> <input type="checkbox" name="remember_login" value="1" id="remember_login" checked /> <label for="remember_login"><?php p($l->t('remember')); ?></label> + <?php endif; ?> <input type="hidden" name="timezone-offset" id="timezone-offset"/> <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/> </fieldset> |