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"
        }
      }
    },
--- a/composer.lock
+++ b/composer.lock
@ -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": "01e94ff8285bcebc8d51432c0accab38",
-    "content-hash": "93e298fb6465f3e74d29d03c40c05a96",
+    "hash": "94a6fb4af98949ac2c1e0abb3a372d97",
+    "content-hash": "1cdb3e32a6a07dbe8c26b861c6cf512b",
    "packages": [
        {
            "name": "aura/session",