aboutsummaryrefslogtreecommitdiffstats
path: root/view/settings.tpl
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-24 01:31:05 +0100
committerzottel <github@zottel.net>2012-03-24 01:31:05 +0100
commitfabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (patch)
tree61dd6d3a8fc5368ad86b5d38a5d177ae9cd2d9f8 /view/settings.tpl
parent14f81eca00a28064ed33f1c234b6ae2e034c17cd (diff)
parentce8cfb7b0531e72fe28b3a6a6440016e482bd016 (diff)
downloadvolse-hubzilla-fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff.tar.gz
volse-hubzilla-fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff.tar.bz2
volse-hubzilla-fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
-rwxr-xr-xview/settings.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/settings.tpl b/view/settings.tpl
index 25479b5bf..2b739c968 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -31,7 +31,7 @@ $nickname_block
{{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}}
-
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" />