diff options
author | zotlabs <mike@macgirvin.com> | 2017-12-21 13:36:33 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-12-21 13:36:33 -0800 |
commit | e7143a265ac97b31a8e0ada85b876ba76c911a3d (patch) | |
tree | dfa42a02359701960f525d10a22e1ebca5b82873 /vendor/league/html-to-markdown/composer.json | |
parent | 684b572aa8005479f3eb219fc526c812c801ca76 (diff) | |
parent | 9c72963d7ce3c60709755edb5d40cb0b06b29cda (diff) | |
download | volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.tar.gz volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.tar.bz2 volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'vendor/league/html-to-markdown/composer.json')
-rw-r--r-- | vendor/league/html-to-markdown/composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json index 58764bcb5..8482b767c 100644 --- a/vendor/league/html-to-markdown/composer.json +++ b/vendor/league/html-to-markdown/composer.json @@ -42,7 +42,7 @@ "bin": ["bin/html-to-markdown"], "extra": { "branch-alias": { - "dev-master": "4.5-dev" + "dev-master": "4.7-dev" } } } |