PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Pierre Rudloff 2017-11-01 23:02:57 +01:00
commit aea9b47370
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -24,7 +24,7 @@
"phpunit/phpunit": "~6.4.3", "phpunit/phpunit": "~6.4.3",
"doctrine/instantiator": "~1.0.0", "doctrine/instantiator": "~1.0.0",
"ffmpeg/ffmpeg": "dev-release", "ffmpeg/ffmpeg": "dev-release",
"rg3/youtube-dl": "~2017.10.20", "rg3/youtube-dl": "2017.10.29",
"rudloff/rtmpdump-bin": "~2.3.0", "rudloff/rtmpdump-bin": "~2.3.0",
"heroku/heroku-buildpack-php": "*" "heroku/heroku-buildpack-php": "*"
}, },
@ -40,10 +40,10 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2017.10.20", "version": "2017.10.29",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2017.10.20.zip" "url": "https://github.com/rg3/youtube-dl/archive/2017.10.29.zip"
} }
} }
}, },

6
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bb5bb53875e26136ad30f50a0ec063a6", "content-hash": "efc0633ab84338ccf8a3f7203549a75e",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -1860,10 +1860,10 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2017.10.20", "version": "2017.10.29",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2017.10.20.zip", "url": "https://github.com/rg3/youtube-dl/archive/2017.10.29.zip",
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },