diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
| commit | 99354ac57622002c0bbd820235d03321406f8d39 (patch) | |
| tree | f8ad698a1c901f757dfc4354721846c8be82ab7e /boot.php | |
| parent | e7b853175154688d60d83ca5935650d1128973c6 (diff) | |
| parent | f396b1bf735a7dc9eb3632e49c1269de54777c6d (diff) | |
| download | volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2 volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -44,10 +44,10 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.9' ); +define ( 'STD_VERSION', '1.9.1' ); define ( 'ZOT_REVISION', '1.1' ); -define ( 'DB_UPDATE_VERSION', 1179 ); +define ( 'DB_UPDATE_VERSION', 1180 ); /** @@ -1703,7 +1703,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) { '$logout' => t('Logout'), '$login' => t('Login'), '$form_id' => $form_id, - '$lname' => array('username', t('Email') , '', ''), + '$lname' => array('username', t('Login/Email') , '', ''), '$lpassword' => array('password', t('Password'), '', ''), '$remember_me' => array('remember_me', t('Remember me'), '', '',array(t('No'),t('Yes'))), '$hiddens' => $hiddens, |