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.json
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-04-12 15:13:50 +02:00
commit ac16e68389
4 changed files with 103 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
composer.json
View file

@ -11,7 +11,8 @@
"mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.0.0",
"symfony/process": "~3.0.0",
"ffmpeg/ffmpeg": "~2.8.2",
"ptachoire/process-builder-chain": "~1.2.0",
"ffmpeg/ffmpeg": "dev-release",
"rudloff/smarty-plugin-noscheme": "~0.1.0",
"guzzlehttp/guzzle": "~6.2.0"
},
@ -40,7 +41,7 @@
"type": "package",
"package": {
"name": "ffmpeg/ffmpeg",
"version": "2.8.4",
"version": "dev-release",
"dist": {
"url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
"type": "xz"