diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-28 16:44:11 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-28 16:44:11 +0200 |
| commit | 67c5be9f199c08ac4c9307901e8e6cc678943f05 (patch) | |
| tree | 061575d844745b3ad43b9aac518b386228966ad3 /settings/templates/personal.php | |
| parent | 8d8a57de7fb41030ffb69f098419616f4003119a (diff) | |
| parent | 0c02e1efef76430eea8986697cd9736814fb604a (diff) | |
| download | nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.tar.gz nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.zip | |
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
Diffstat (limited to 'settings/templates/personal.php')
| -rw-r--r-- | settings/templates/personal.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 9602414b668..b94b8452585 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -40,7 +40,7 @@ if($_['passwordChangeSupported']) { <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" /> - <input type="password" id="pass2" name="password" + <input type="password" id="pass2" name="personal-password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" /> <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> |