Merge branch '2.6RC'2.6

1 files changed, 48 insertions, 0 deletions

diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json
new file mode 100644
index 000000000..58764bcb5
--- /dev/null
+++ b/vendor/league/html-to-markdown/composer.json
@@ -0,0 +1,48 @@
+{
+    "name": "league/html-to-markdown",
+    "type": "library",
+    "description": "An HTML-to-markdown conversion helper for PHP",
+    "keywords": ["markdown", "html"],
+    "homepage": "https://github.com/thephpleague/html-to-markdown",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Colin O'Dell",
+            "email": "colinodell@gmail.com",
+            "homepage": "http://www.colinodell.com",
+            "role": "Lead Developer"
+        },
+        {
+            "name": "Nick Cernis",
+            "email": "nick@cern.is",
+            "homepage": "http://modernnerd.net",
+            "role": "Original Author"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "League\\HTMLToMarkdown\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "League\\HTMLToMarkdown\\Test\\": "tests"
+        }
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "ext-dom": "*",
+        "ext-xml": "*"
+    },
+    "require-dev": {
+        "mikehaertl/php-shellcommand": "~1.1.0",
+        "phpunit/phpunit": "4.*",
+        "scrutinizer/ocular": "~1.1"
+    },
+    "bin": ["bin/html-to-markdown"],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.5-dev"
+        }
+    }
+}