Merge branch 'feature/audio-upload' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 21 May 2019 08:05:12 +0000 (10:05 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 21 May 2019 08:05:12 +0000 (10:05 +0200)
commit73b3aa6429dfb2e31628fa09a479dce318289d7d
tree88cf5c7c49ba89c18633a4a64a4acfc8d40b4a50
parentfd822c1c699fb89bb1c3218e047e1d842bc1ba1a
parent618750486ee2732e0ad3525349e4d42f29e1803e
Merge branch 'feature/audio-upload' into develop
client/src/app/videos/+video-watch/video-watch.component.ts
config/default.yaml
server/initializers/config.ts