Merge tag '0.4.2' into develop

Use composer to download ffmpeg
Fix travis builds
This commit is contained in:
Pierre Rudloff 2015-11-21 21:59:46 +01:00
commit 79b82c85f4

View file

@ -1,6 +1,6 @@
{ {
"name": "alltube", "name": "alltube",
"version": "0.4.1", "version": "0.4.2",
"dependencies": { "dependencies": {
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-cli": "~0.1.13", "grunt-cli": "~0.1.13",