Merge branch 'release/v1.3.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 7 Jun 2019 13:04:41 +0000 (15:04 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 7 Jun 2019 13:04:41 +0000 (15:04 +0200)
1  2 
client/src/app/videos/+video-edit/shared/video-edit.component.ts
server/controllers/static.ts

Simple merge