From: Chocobozzz <me@florianbigard.com>
Date: Tue, 21 May 2019 09:21:56 +0000 (+0200)
Subject: Merge branch 'release/v1.3.0' into develop
X-Git-Tag: v1.4.0-rc.1~232
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=432ebe8bddb407bfbe503b782d59b1ee4c0d6842;p=oweals%2Fpeertube.git

Merge branch 'release/v1.3.0' into develop
---

432ebe8bddb407bfbe503b782d59b1ee4c0d6842
diff --cc client/src/app/shared/buttons/delete-button.component.html
index d278e7015,b4acb9d32..25196fbd5
--- a/client/src/app/shared/buttons/delete-button.component.html
+++ b/client/src/app/shared/buttons/delete-button.component.html
@@@ -1,4 -1,4 +1,4 @@@
- <span class="action-button action-button-delete grey-button" [title]="getTitle()" role="button">
 -<span class="action-button action-button-delete" [title]="title" role="button">
++<span class="action-button action-button-delete grey-button" [title]="title" role="button">
    <my-global-icon iconName="delete"></my-global-icon>
  
    <span class="button-label" *ngIf="label">{{ label }}</span>