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
	controllers/FrontController.php
This commit is contained in:
Pierre Rudloff 2016-07-27 02:31:47 +02:00
commit aba3d0c9f5
17 changed files with 283 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

14
composer.json
View file

@ -6,11 +6,11 @@
"type": "project",
"require": {
"smarty/smarty": "~3.1.29",
"rg3/youtube-dl": "2016.04.13",
"slim/slim": "3.x-dev",
"rg3/youtube-dl": "~2016.07.26",
"slim/slim": "~3.5.0",
"mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.0.0",
"symfony/process": "~3.0.0",
"symfony/yaml": "~3.1.0",
"symfony/process": "~3.1.0",
"ptachoire/process-builder-chain": "~1.2.0",
"ffmpeg/ffmpeg": "dev-release",
"rudloff/smarty-plugin-noscheme": "~0.1.0",
@ -19,7 +19,7 @@
"rudloff/psr7-process-stream": "~0.1.0"
},
"require-dev": {
"symfony/var-dumper": "~3.0.0"
"symfony/var-dumper": "~3.1.0"
},
"extra": {
"paas": {
@ -32,11 +32,11 @@
"type": "package",
"package": {
"name": "rg3/youtube-dl",
"version": "2016.04.13",
"version": "2016.07.26",
"source": {
"url": "https://github.com/rg3/youtube-dl.git",
"type": "git",
"reference": "9e285387260a019d7471c3bdbd52cc764c0e8700"
"reference": "2016.07.26"
}
}
}, {