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-04-12 11:05:54 +02:00
commit b2b062703a
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -6,7 +6,7 @@
"type": "project",
"require": {
"smarty/smarty": "~3.1.29",
"rg3/youtube-dl": "2016.04.05",
"rg3/youtube-dl": "2016.04.06",
"slim/slim": "~3.3.0",
"mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.0.0",
@ -29,11 +29,11 @@
"type": "package",
"package": {
"name": "rg3/youtube-dl",
"version": "2016.04.05",
"version": "2016.04.06",
"source": {
"url": "https://github.com/rg3/youtube-dl.git",
"type": "git",
"reference": "2016.04.05"
"reference": "2016.04.06"
}
}
}, {