Merge branch '2.4RC'2.4

1 files changed, 38 insertions, 0 deletions

diff --git a/vendor/pixel418/markdownify/composer.json b/vendor/pixel418/markdownify/composer.json
new file mode 100644
index 000000000..71d9f3565
--- /dev/null
+++ b/vendor/pixel418/markdownify/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "pixel418/markdownify",
+    "type": "lib",
+    "description": "The HTML to Markdown converter for PHP ",
+    "keywords": ["markdown", "markdownify"],
+    "license": "LGPL",
+    "homepage": "https://github.com/elephant418/Markdownify",
+    "authors": [
+        {
+            "name": "Milian Wolff",
+            "email": "mail@milianw.de",
+            "homepage": "http://milianw.de"
+
+        },
+        {
+            "name": "Peter Kruithof",
+            "email": "pkruithof@gmail.com",
+            "homepage": "http://pkruithof.tumblr.com/"
+        },
+        {
+            "name": "Thomas Zilliox",
+            "email": "hello@tzi.fr",
+            "homepage": "http://tzi.fr"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8"
+    },
+    "autoload": {
+        "psr-4": {
+            "Markdownify\\": "src",
+            "Test\\Markdownify\\": "test"
+        }
+    }
+}