Merge branch 'develop' of github.com:Rudloff/alltube into develop

Conflicts: composer.lock
2016-12-03 14:00:25 +01:00 · 2016-12-03 14:00:25 +01:00 · a426f3297a
commit a426f3297a
parent d61ad24d25 24c9684784
2 changed files with 6 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -39,6 +39,10 @@
          "url": "https://github.com/rg3/youtube-dl.git",
          "type": "git",
          "reference": "2016.09.08"
+        },
+        "dist": {
+          "type": "tar",
+          "url": "https://github.com/rg3/youtube-dl/archive/2016.09.08.tar.gz"
        }
      }
    },