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-30 02:36:04 +02:00
commit 14116168af
7 changed files with 84 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

59
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",
"This file is @generated automatically"
],
"hash": "411e020d026dab32ecc2bb6c2c059f22",
"content-hash": "1442dea55dfe2b876dd29d0af142ec28",
"hash": "962f54d3ada96f7d3289479b13812c1a",
"content-hash": "2dea64564c520577cb275f73d046ed75",
"packages": [
{
"name": "container-interop/container-interop",
@ -163,16 +163,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.2.3",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
"reference": "31382fef2889136415751badebbd1cb022a4ed72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
"reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
"reference": "31382fef2889136415751badebbd1cb022a4ed72",
"shasum": ""
},
"require": {
@ -217,7 +217,7 @@
"stream",
"uri"
],
"time": "2016-02-18 21:54:00"
"time": "2016-04-13 19:56:01"
},
{
"name": "jeremykendall/php-domain-parser",
@ -571,14 +571,47 @@
},
{
"name": "rg3/youtube-dl",
"version": "2016.04.06",
"version": "2016.04.13",
"source": {
"type": "git",
"url": "https://github.com/rg3/youtube-dl.git",
"reference": "2016.04.06"
"reference": "9e285387260a019d7471c3bdbd52cc764c0e8700"
},
"type": "library"
},
{
"name": "rudloff/psr7-process-stream",
"version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/Rudloff/psr7-process-stream.git",
"reference": "055ecbdadee9b43904aed75d5a548c277cac10a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Rudloff/psr7-process-stream/zipball/055ecbdadee9b43904aed75d5a548c277cac10a8",
"reference": "055ecbdadee9b43904aed75d5a548c277cac10a8",
"shasum": ""
},
"require": {
"guzzlehttp/psr7": "~1.3.0"
},
"require-dev": {
"symfony/var-dumper": "~3.0.0"
},
"type": "library",
"autoload": {
"psr-4": {
"ProcessStream\\": "classes/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-3.0"
],
"description": "PSR-7 stream implementation that can be used to manage processes",
"time": "2016-04-14 10:36:10"
},
{
"name": "rudloff/rtmpdump-bin",
"version": "2.3",
@ -654,12 +687,12 @@
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
"reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8"
"reference": "b2e82a75467c12d94f038d433363e4aa7e8bf603"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/a810d837adc0e5cf7fba72815a6213fe50e15cc8",
"reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/b2e82a75467c12d94f038d433363e4aa7e8bf603",
"reference": "b2e82a75467c12d94f038d433363e4aa7e8bf603",
"shasum": ""
},
"require": {
@ -713,7 +746,7 @@
"micro",
"router"
],
"time": "2016-04-13 08:33:19"
"time": "2016-04-14 09:05:11"
},
{
"name": "smarty/smarty",