diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
| commit | 629a66793c245d39ca47523a6fbc790fae0cbe3b (patch) | |
| tree | e1714c8fca95087ff97a844688c40ade60c3b8ef /view/settings.tpl | |
| parent | 2147ffa48734e50c9df1ea91ce100bf5336eacc2 (diff) | |
| parent | 37f02424f801b3132b75b39d4132f35025667a75 (diff) | |
| download | volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.gz volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.bz2 volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
small fix
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
position the theme-preview on settings page
more wordsmithing of the Friendica invitation email
screenshot gallery
theme preview for end users
* master:
Diffstat (limited to 'view/settings.tpl')
| -rwxr-xr-x | view/settings.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 2b739c968..75225a0f1 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,7 +28,7 @@ $nickname_block {{inc field_custom.tpl with $field=$timezone }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} -{{inc field_select.tpl with $field=$theme }}{{endinc}} +{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} {{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} |