diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-11 20:22:28 +0100 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-11 20:22:28 +0100 |
| commit | d653e27e2dfc172fd66a0987312952d736aca3e7 (patch) | |
| tree | e0725ca5cf27fc4400a7566eebc0721528d69fd4 /view/settings.tpl | |
| parent | ebdf4842184cc8d0576abe99b29650c6b6512167 (diff) | |
| parent | 1dad15a021cc5d03f4238ab77ff051fc0ca1e35e (diff) | |
| download | volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.gz volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.bz2 volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.zip | |
Merge commit 'upstream/master'
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
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" > |