Merge branch 'release-2.0.5'

This commit is contained in:
Pierre Rudloff 2019-09-14 12:48:29 +02:00
commit 533a5b6cd2
3 changed files with 7 additions and 7 deletions

View file

@ -23,7 +23,7 @@
"phpunit/phpunit": "~6.5.2", "phpunit/phpunit": "~6.5.2",
"doctrine/instantiator": "~1.0.0", "doctrine/instantiator": "~1.0.0",
"ffmpeg/ffmpeg": "4.0.3", "ffmpeg/ffmpeg": "4.0.3",
"rg3/youtube-dl": "2019.07.02", "rg3/youtube-dl": "2019.09.12.1",
"heroku/heroku-buildpack-php": "*", "heroku/heroku-buildpack-php": "*",
"anam/phantomjs-linux-x86-binary": "~2.1.1", "anam/phantomjs-linux-x86-binary": "~2.1.1",
"phpstan/phpstan": "~0.9.2" "phpstan/phpstan": "~0.9.2"
@ -40,10 +40,10 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2019.07.02", "version": "2019.09.12.1",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2019.07.02.zip" "url": "https://github.com/rg3/youtube-dl/archive/2019.09.12.1.zip"
} }
} }
}, },

6
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e61271a926e9a1df93f64ed32bc0d9ac", "content-hash": "e76c13aa0587fbef823cd805264ba56c",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -3046,10 +3046,10 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2019.07.02", "version": "2019.09.12.1",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2019.07.02.zip" "url": "https://github.com/rg3/youtube-dl/archive/2019.09.12.1.zip"
}, },
"type": "library" "type": "library"
}, },

View file

@ -1,7 +1,7 @@
{ {
"name": "alltube", "name": "alltube",
"description": "HTML GUI for youtube-dl", "description": "HTML GUI for youtube-dl",
"version": "2.0.4", "version": "2.0.5",
"author": "Pierre Rudloff", "author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues", "bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": { "dependencies": {