diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-05 11:02:19 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-05 11:02:19 -0800 |
| commit | 384db9d10dbded64e83564daa4c51dac05674a2b (patch) | |
| tree | 9f878ae892650ac124f073b129190d9801c3e4a8 /composer.json | |
| parent | b2ea61ea3e389cd3ca36a656e6165fb3500035e5 (diff) | |
| parent | 5d8b0acc167a8028d3476ba468223da8c6f1a276 (diff) | |
| download | volse-hubzilla-384db9d10dbded64e83564daa4c51dac05674a2b.tar.gz volse-hubzilla-384db9d10dbded64e83564daa4c51dac05674a2b.tar.bz2 volse-hubzilla-384db9d10dbded64e83564daa4c51dac05674a2b.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index d977987eb..b59c81bba 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "ext-xml" : "*", "ext-openssl" : "*", "sabre/dav" : "~3.2", - "michelf/php-markdown" : "^1.7" + "michelf/php-markdown" : "^1.7", + "pixel418/markdownify": "^2.2" }, "require-dev" : { "php" : ">=5.6", |