Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 670bc85ba8468dbe9a427abc54f2bca9d4e71749

1
2
3
4
<div class="ui-grid-cell-contents">
    <img ng-if="!row.entity.customIcon" ng-src="editor-app/stencilsets/{{getStencilSetName()}}/icons/{{row.entity.icon}}" />
    <img ng-if="row.entity.customIcon" ng-src="{{getImageUrl(row.entity.icon)}}"/>
</div>