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)
commitb91bc1d1f3591c35ab4426f6ab594b4bd9f1ef62
tree754bb49026d4df8086030e28a8a7c16e3f0338b6
parent851f5daa1eec66e1faa3c45238ec9ab91be05b00
parent03371ad9d049bab79445a1b35da44cb1272f6c28
Merge branch 'release/v1.3.0' into develop
client/src/app/videos/+video-edit/shared/video-edit.component.ts
server/controllers/static.ts