Merge branch 'develop' of github.com:Rudloff/alltube into develop
This commit is contained in:
commit
bbb05b0e3b
3 changed files with 8 additions and 8 deletions
|
@ -6,7 +6,7 @@
|
|||
"type": "project",
|
||||
"require": {
|
||||
"smarty/smarty": "~3.1",
|
||||
"rg3/youtube-dl": "2015.11.24",
|
||||
"rg3/youtube-dl": "2015.12.06",
|
||||
"slim/slim": "~2.6.2",
|
||||
"slim/views": "~0.1.3",
|
||||
"rudloff/smarty-plugin-noscheme": "~0.1.0",
|
||||
|
@ -28,11 +28,11 @@
|
|||
"type": "package",
|
||||
"package": {
|
||||
"name": "rg3/youtube-dl",
|
||||
"version": "2015.11.24",
|
||||
"version": "2015.12.06",
|
||||
"source": {
|
||||
"url": "https://github.com/rg3/youtube-dl.git",
|
||||
"type": "git",
|
||||
"reference": "2015.11.24"
|
||||
"reference": "2015.12.06"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
8
composer.lock
generated
8
composer.lock
generated
|
@ -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": "a0a7848fd7cdbcd7770cd37eaaf20aec",
|
||||
"content-hash": "dd8074b60a044ec848a2e91b6fadbfc9",
|
||||
"hash": "c7b053d687208446a7f7456623d6e888",
|
||||
"content-hash": "2ed45cb5e9f8cb491d41f4272a543c5c",
|
||||
"packages": [
|
||||
{
|
||||
"name": "ffmpeg/ffmpeg",
|
||||
|
@ -199,11 +199,11 @@
|
|||
},
|
||||
{
|
||||
"name": "rg3/youtube-dl",
|
||||
"version": "2015.11.24",
|
||||
"version": "2015.12.06",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/rg3/youtube-dl.git",
|
||||
"reference": "2015.11.24"
|
||||
"reference": "2015.12.06"
|
||||
},
|
||||
"type": "library"
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "alltube",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.3",
|
||||
"dependencies": {
|
||||
"grunt": "~0.4.5",
|
||||
"grunt-cli": "~0.1.13",
|
||||
|
|
Loading…
Reference in a new issue