Merge branch 'gzdyh_prod'

xusd

2 days ago c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380

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>