diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
| commit | de4f9d68bdaade902a8030888f9df035fa1329ec (patch) | |
| tree | 5021daad0c4002ce9b7c89233b7c8446552b5a07 /boot.php | |
| parent | 191cd21028ab108c2a7f982c654601d780865eff (diff) | |
| parent | 571b8cc85b3a770f16aed021bb39b889e0275ed6 (diff) | |
| download | volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.gz volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.bz2 volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.zip | |
Merge branch 'dev' into perms
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.11' ); define ( 'ZOT_REVISION', '1.1' ); -define ( 'DB_UPDATE_VERSION', 1180 ); +define ( 'DB_UPDATE_VERSION', 1181 ); /** @@ -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, |