diff options
| author | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
| commit | 7127626f55f0ae5843d38145bf80022b98e4a8d8 (patch) | |
| tree | 59813e196f7288be421cf187c2231adedca7d4b6 /view/settings.tpl | |
| parent | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (diff) | |
| parent | 1f74bd1b78f7db4940f0fded0d6f7716579218f0 (diff) | |
| download | volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.gz volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.bz2 volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
| -rwxr-xr-x | view/settings.tpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index f0fd70921..8753474af 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -56,6 +56,10 @@ $blocktags $suggestme +$unkmail + +{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} + {{inc field_input.tpl with $field=$expire.days }}{{endinc}} <div class="field input"> <span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span> |