Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 66 insertions, 58 deletions

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e51d754d8..c416061ff 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -435,64 +435,6 @@
         ]
     },
     {
-        "name": "pixel418/markdownify",
-        "version": "v2.2.1",
-        "version_normalized": "2.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Elephant418/Markdownify.git",
-            "reference": "0160677f04c784550dd10fd72fdf3994967db848"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Elephant418/Markdownify/zipball/0160677f04c784550dd10fd72fdf3994967db848",
-            "reference": "0160677f04c784550dd10fd72fdf3994967db848",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.8"
-        },
-        "time": "2016-09-21T13:01:43+00:00",
-        "type": "lib",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Markdownify\\": "src",
-                "Test\\Markdownify\\": "test"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL"
-        ],
-        "authors": [
-            {
-                "name": "Peter Kruithof",
-                "email": "pkruithof@gmail.com",
-                "homepage": "http://pkruithof.tumblr.com/"
-            },
-            {
-                "name": "Milian Wolff",
-                "email": "mail@milianw.de",
-                "homepage": "http://milianw.de"
-            },
-            {
-                "name": "Thomas Zilliox",
-                "email": "hello@tzi.fr",
-                "homepage": "http://tzi.fr"
-            }
-        ],
-        "description": "The HTML to Markdown converter for PHP ",
-        "homepage": "https://github.com/elephant418/Markdownify",
-        "keywords": [
-            "markdown",
-            "markdownify"
-        ]
-    },
-    {
         "name": "bshaffer/oauth2-server-php",
         "version": "v1.9.0",
         "version_normalized": "1.9.0.0",
@@ -748,5 +690,71 @@
             "framework",
             "iCalendar"
         ]
+    },
+    {
+        "name": "league/html-to-markdown",
+        "version": "4.4.1",
+        "version_normalized": "4.4.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/thephpleague/html-to-markdown.git",
+            "reference": "82ea375b5b2b1da1da222644c0565c695bf88186"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186",
+            "reference": "82ea375b5b2b1da1da222644c0565c695bf88186",
+            "shasum": ""
+        },
+        "require": {
+            "ext-dom": "*",
+            "ext-xml": "*",
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "mikehaertl/php-shellcommand": "~1.1.0",
+            "phpunit/phpunit": "4.*",
+            "scrutinizer/ocular": "~1.1"
+        },
+        "time": "2017-03-16T00:45:59+00:00",
+        "bin": [
+            "bin/html-to-markdown"
+        ],
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "4.5-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "League\\HTMLToMarkdown\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "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"
+            }
+        ],
+        "description": "An HTML-to-markdown conversion helper for PHP",
+        "homepage": "https://github.com/thephpleague/html-to-markdown",
+        "keywords": [
+            "html",
+            "markdown"
+        ]
     }
 ]