aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2016-10-22 12:53:15 +0200
committerGitHub <noreply@github.com>2016-10-22 12:53:15 +0200
commit761b4e283737a48934457855448df98e8014ba73 (patch)
tree3a98fc6dee7edd3a13f335f97fb9bc4faf95f064 /composer.json
parent3d5e0aede31e07f060e3ca470d36374c54d5040c (diff)
parentc5941f316a49c94eff354b63e75b3add98ac4aea (diff)
downloadShaarli-761b4e283737a48934457855448df98e8014ba73.tar.gz
Shaarli-761b4e283737a48934457855448df98e8014ba73.tar.zst
Shaarli-761b4e283737a48934457855448df98e8014ba73.zip
Merge pull request #674 from ArthurHoaro/parsedown-composer
Use Composer for Parsedown and fix an issue with links
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 89a7e446..f7d26a31 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
11 "keywords": ["bookmark", "link", "share", "web"], 11 "keywords": ["bookmark", "link", "share", "web"],
12 "require": { 12 "require": {
13 "php": ">=5.3.4", 13 "php": ">=5.3.4",
14 "shaarli/netscape-bookmark-parser": "1.*" 14 "shaarli/netscape-bookmark-parser": "1.*",
15 "erusev/parsedown": "1.6"
15 }, 16 },
16 "require-dev": { 17 "require-dev": {
17 "phpmd/phpmd" : "@stable", 18 "phpmd/phpmd" : "@stable",