Merge branch 'develop' into feature/stream

Conflicts: composer.lock
2016-07-27 13:21:18 +02:00 · 2016-07-27 13:21:18 +02:00 · 29cf3160a0
commit 29cf3160a0
parent 8144aab43d 19136b85f2
6 changed files with 22 additions and 16 deletions
--- a/controllers/FrontController.php
+++ b/controllers/FrontController.php
@ -199,6 +199,7 @@ class FrontController
                                    array(
                                        'curl',
                                        '--silent',
+                                        '--location',
                                        '--user-agent', $video->http_headers->{'User-Agent'},
                                        $video->url
                                    ),