diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
| commit | d9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch) | |
| tree | 86a91ec7a556310400c2eb26d45bbeb108486b36 /view/tpl/settings_display.tpl | |
| parent | 2cb2896916ce98f16b891634fddcbd403c55d95f (diff) | |
| parent | e9b5b0f0b424930b87708080c4e6ce671016177b (diff) | |
| download | volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2 volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl/settings_display.tpl')
| -rw-r--r-- | view/tpl/settings_display.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 24fc11027..2aac64515 100644 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,7 +6,7 @@ {{inc field_themeselect.tpl with $field=$theme }}{{endinc}} {{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage }}{{endinc}} {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} |