aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/settings.tpl
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-09-22 22:44:10 +0200
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-09-22 22:44:10 +0200
commit6a9e8fcd20c0101d448061fdbf51034ab456d2c3 (patch)
tree08e4a6d051636b90a98a6889a0b677a7d7049982 /view/tpl/settings.tpl
parented7f3001c1c1deec5076ae12114e5c42865b6251 (diff)
parent2070dbfdeace4a902208e9dfb50d950647142e99 (diff)
downloadvolse-hubzilla-6a9e8fcd20c0101d448061fdbf51034ab456d2c3.tar.gz
volse-hubzilla-6a9e8fcd20c0101d448061fdbf51034ab456d2c3.tar.bz2
volse-hubzilla-6a9e8fcd20c0101d448061fdbf51034ab456d2c3.zip
Merge from upstream
Diffstat (limited to 'view/tpl/settings.tpl')
-rwxr-xr-xview/tpl/settings.tpl1
1 files changed, 0 insertions, 1 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 443e63696..4dba1f23e 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -24,7 +24,6 @@
{{include file="field_checkbox.tpl" field=$hide_presence}}
-
<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
<ul id="settings-privacy-macros">
<li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>