Merge branch 'master' into minor

packages/admin-ui/src/lib/marketing/src/components/promotion-list/promotion-list.component.html

@@ -117,8 +117,8 @@
         </ng-template>
     </vdr-dt2-column>
     <vdr-dt2-column
-        [heading]="'marketing.per-customer-limit' | translate"
-        id="per-customer-limit"
+        [heading]="'marketing.usage-limit' | translate"
+        id="usage-limit"
         [sort]="sorts.get('usageLimit')"
         [hiddenByDefault]="true"
     >