diff options
author | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
commit | a8d81a68d62e982094110a340341756fbb6df4a9 (patch) | |
tree | 51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/michelf/php-markdown/composer.json | |
parent | abe6ab477531916158c04e3d387cb02e839d28b6 (diff) | |
parent | 09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff) | |
download | volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2 volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/michelf/php-markdown/composer.json')
-rw-r--r-- | vendor/michelf/php-markdown/composer.json | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vendor/michelf/php-markdown/composer.json b/vendor/michelf/php-markdown/composer.json index 36a4f744a..6b1993d65 100644 --- a/vendor/michelf/php-markdown/composer.json +++ b/vendor/michelf/php-markdown/composer.json @@ -21,11 +21,6 @@ "php": ">=5.3.0" }, "autoload": { - "psr-0": { "Michelf": "" } - }, - "extra": { - "branch-alias": { - "dev-lib": "1.4.x-dev" - } + "psr-4": { "Michelf\\": "Michelf/" } } } |