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

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-12-26 14:11:23 +01:00
commit ce9f794395
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -21,7 +21,7 @@
"squizlabs/php_codesniffer": "~2.7.0", "squizlabs/php_codesniffer": "~2.7.0",
"phpunit/phpunit": "~5.7.2", "phpunit/phpunit": "~5.7.2",
"ffmpeg/ffmpeg": "dev-release", "ffmpeg/ffmpeg": "dev-release",
"rg3/youtube-dl": "~2016.12.20", "rg3/youtube-dl": "~2016.12.22",
"rudloff/rtmpdump-bin": "~2.3" "rudloff/rtmpdump-bin": "~2.3"
}, },
"extra": { "extra": {
@ -36,10 +36,10 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2016.12.20", "version": "2016.12.22",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2016.12.20.zip" "url": "https://github.com/rg3/youtube-dl/archive/2016.12.22.zip"
} }
} }
}, },

8
composer.lock generated
View file

@ -4,8 +4,8 @@
"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"
], ],
"hash": "a4497d475262ef7fa88f43d6bd18b3db", "hash": "7e2dc259a435b944643699141b2a9344",
"content-hash": "f553e8eeebb1466397549b8304eccece", "content-hash": "736c2be881e2080b6e3c3fe770016737",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -1622,10 +1622,10 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2016.12.20", "version": "2016.12.22",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/rg3/youtube-dl/archive/2016.12.20.zip", "url": "https://github.com/rg3/youtube-dl/archive/2016.12.22.zip",
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },