Merge branch 'develop' of github.com:Rudloff/alltube into develop

This commit is contained in:
Pierre Rudloff 2017-04-25 22:12:26 +02:00
commit f9da2febe3
3 changed files with 2 additions and 3 deletions

View file

@ -38,7 +38,7 @@ class Config
* *
* @var array * @var array
*/ */
public $params = ['--no-warnings']; public $params = ['--no-warnings', '--ignore-errors'];
/** /**
* Enable audio conversion. * Enable audio conversion.

View file

@ -127,7 +127,7 @@ class VideoDownload
* @param string $format Format to use for the video * @param string $format Format to use for the video
* @param string $password Video password * @param string $password Video password
* *
* @return array URLs of video * @return string[] URLs of video
* */ * */
public function getURL($url, $format = null, $password = null) public function getURL($url, $format = null, $password = null)
{ {

View file

@ -17,6 +17,5 @@
</div> </div>
{/foreach} {/foreach}
</div>
</div> </div>
{include file="inc/footer.tpl"} {include file="inc/footer.tpl"}