diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-10 00:15:29 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-10 00:15:29 -0500 |
| commit | 665ad7e6600778c446aa9c5fc48ed32b309e64a7 (patch) | |
| tree | dc899a136a2b9666f8f44bfec5e515ea7198ff29 /view/settings.tpl | |
| parent | 686fe47b8892d3c3cd82b77b77adf3c990a7c160 (diff) | |
| parent | d50a839c0420634ec5756c9f2f95c26484b63b4d (diff) | |
| download | volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.tar.gz volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.tar.bz2 volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
spec directory
allow user to set number of items to show on network page
revup
* master:
Diffstat (limited to 'view/settings.tpl')
| -rwxr-xr-x | view/settings.tpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index b7f427b32..46c737b23 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -30,6 +30,7 @@ $nickname_block {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} {{inc field_select.tpl with $field=$theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} <div class="settings-submit-wrapper" > |