Merge branch 'dev' into red
This commit is contained in:
commit
02b390d7b8
@ -217,7 +217,7 @@
|
|||||||
|
|
||||||
<div id="jot-preview-content" style="display:none;"></div>
|
<div id="jot-preview-content" style="display:none;"></div>
|
||||||
|
|
||||||
{{if $showacl}}{{$acl}}{{/if}}
|
{{$acl}}
|
||||||
|
|
||||||
{{if $feature_expire}}
|
{{if $feature_expire}}
|
||||||
<!-- Modal for item expiry-->
|
<!-- Modal for item expiry-->
|
||||||
|
Reference in New Issue
Block a user