Merge branch 'release/v1.3.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 24 May 2019 10:02:45 +0000 (12:02 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 24 May 2019 10:02:45 +0000 (12:02 +0200)
commit86aafd06f2d124786ea3d10477f356c2e3f85dd6
tree759f2fc130a5f44dfc19d0d43b1c78a3a065e4ee
parent8d51015bd0bdf9c1bc1df9a1ba127d87ba0f36ae
parent624bca15fb7a15a0a788c3d06c41af451bfca28c
Merge branch 'release/v1.3.0' into develop
client/src/app/shared/video-playlist/video-add-to-playlist.component.ts