Merge branch 'release/v1.3.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 21 May 2019 09:21:56 +0000 (11:21 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 21 May 2019 09:21:56 +0000 (11:21 +0200)
commit432ebe8bddb407bfbe503b782d59b1ee4c0d6842
treeb37b83b0edea8655e7fc24326eb520ebb29297fe
parent73b3aa6429dfb2e31628fa09a479dce318289d7d
parentb9dde7d96b28a8004a2698f465447f0f9b6b6dbb
Merge branch 'release/v1.3.0' into develop
client/src/app/+my-account/my-account-videos/my-account-videos.component.html
client/src/app/shared/buttons/delete-button.component.html