diff options
author | friendica <info@friendica.com> | 2015-01-01 21:49:01 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-01 21:49:01 -0800 |
commit | 545e47933a0816699c68d98a7742a03260d6a54f (patch) | |
tree | 1590e642e1eb48c76dd7c82b4bab4bb93ddf344d /mod/setup.php | |
parent | 0286c5a35b7f6fb0f02e50110deb78ae66a028cf (diff) | |
parent | 9d4c4efb5176afe5284bc5c22df277510c64786b (diff) | |
download | volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.tar.gz volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.tar.bz2 volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod/setup.php')
-rwxr-xr-x | mod/setup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/setup.php b/mod/setup.php index 044def15a..6f2c7c074 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -349,7 +349,7 @@ function setup_content(&$a) { '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''), + '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), '$baseurl' => $a->get_baseurl(), |