Merge branch 'dev' into red

This commit is contained in:
zotlabs
2017-03-13 15:13:59 -07:00

View File

@@ -217,7 +217,7 @@
<div id="jot-preview-content" style="display:none;"></div>
{{if $showacl}}{{$acl}}{{/if}}
{{$acl}}
{{if $feature_expire}}
<!-- Modal for item expiry-->