Merge remote-tracking branch 'upstream/develop' into forum3
This commit is contained in:
commit
51fb265621
8 changed files with 241 additions and 206 deletions
|
@ -11,7 +11,7 @@
|
|||
|
||||
<div id="settings_general_expanded" class="settings-block" style="display: none;">
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$accept_only_sharer}}
|
||||
{{include file="field_select.tpl" field=$accept_only_sharer}}
|
||||
{{include file="field_checkbox.tpl" field=$enable_cw}}
|
||||
{{include file="field_checkbox.tpl" field=$enable_smart_shortening}}
|
||||
{{include file="field_checkbox.tpl" field=$simple_shortening}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue