genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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",
"phpunit/phpunit": "~5.7.2",
"ffmpeg/ffmpeg": "dev-release",
"rg3/youtube-dl": "~2016.12.20",
"rg3/youtube-dl": "~2016.12.22",
"rudloff/rtmpdump-bin": "~2.3"
},
"extra": {
@ -36,10 +36,10 @@
"type": "package",
"package": {
"name": "rg3/youtube-dl",
"version": "2016.12.20",
"version": "2016.12.22",
"dist": {
"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"
}
}
},