diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
| commit | 6413395a76d57960708f17016f04a682b3643aa7 (patch) | |
| tree | 32ba1c7156f4e7c4bc72dcea384bfedf2d35834c /view/tpl/settings_display.tpl | |
| parent | 6cc906fd1d7226e4db2f546551c14fe04ea815e7 (diff) | |
| parent | 1d96e165e00ed54df0573bda79c2a274f21aeb16 (diff) | |
| download | volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.gz volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.bz2 volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/settings_display.tpl')
| -rwxr-xr-x | view/tpl/settings_display.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 8e870ba0e..8bf4dc0cc 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -11,6 +11,8 @@ {{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} +{{include file="field_input.tpl" field=$channel_divmore_height}} +{{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} {{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$channel_list_mode}} |