Merge branch 'release-1.2.4'

This commit is contained in:
Pierre Rudloff 2018-11-23 15:59:58 +01:00
commit 4aabbd1ee3
3 changed files with 7 additions and 7 deletions

View file

@ -22,7 +22,7 @@
"squizlabs/php_codesniffer": "~3.2.2", "squizlabs/php_codesniffer": "~3.2.2",
"phpunit/phpunit": "~6.5.2", "phpunit/phpunit": "~6.5.2",
"doctrine/instantiator": "~1.0.0", "doctrine/instantiator": "~1.0.0",
"ffmpeg/ffmpeg": "4.0.2", "ffmpeg/ffmpeg": "4.0.3",
"rg3/youtube-dl": "2018.11.07", "rg3/youtube-dl": "2018.11.07",
"heroku/heroku-buildpack-php": "*", "heroku/heroku-buildpack-php": "*",
"anam/phantomjs-linux-x86-binary": "~2.1.1" "anam/phantomjs-linux-x86-binary": "~2.1.1"
@ -50,9 +50,9 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
"version": "4.0.2", "version": "4.0.3",
"dist": { "dist": {
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0.2-64bit-static.tar.xz", "url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz",
"type": "xz" "type": "xz"
}, },
"bin": [ "bin": [

6
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9290c3e6ef15fb65892664adfd8f24c2", "content-hash": "2f25c657ba117b6ebbe7992c501bd890",
"packages": [ "packages": [
{ {
"name": "aura/session", "name": "aura/session",
@ -1448,10 +1448,10 @@
}, },
{ {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
"version": "4.0.2", "version": "4.0.3",
"dist": { "dist": {
"type": "xz", "type": "xz",
"url": "https://johnvansickle.com/ffmpeg/releases/ffmpeg-4.0.2-64bit-static.tar.xz", "url": "https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz",
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },

View file

@ -1,7 +1,7 @@
{ {
"name": "alltube", "name": "alltube",
"description": "HTML GUI for youtube-dl", "description": "HTML GUI for youtube-dl",
"version": "1.2.3", "version": "1.2.4",
"author": "Pierre Rudloff", "author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues", "bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": { "dependencies": {