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-13 10:33:51 +02:00
commit f7577b9825
5 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
composer.json
View file

@ -14,7 +14,8 @@
"ptachoire/process-builder-chain": "~1.2.0",
"ffmpeg/ffmpeg": "dev-release",
"rudloff/smarty-plugin-noscheme": "~0.1.0",
"guzzlehttp/guzzle": "~6.2.0"
"guzzlehttp/guzzle": "~6.2.0",
"rudloff/rtmpdump-bin": "~2.3"
},
"require-dev": {
"symfony/var-dumper": "~3.0.0"