Merge branch 'upgrade-parsedown' into 'develop'

Upgrade parsedown

Closes #226

See merge request framasoft/framadate!233
This commit is contained in:
Thomas Citharel 2018-03-19 10:36:37 +01:00
commit 8931255033

View File

@ -61,7 +61,7 @@
"phpmailer/phpmailer": "^5.2", "phpmailer/phpmailer": "^5.2",
"ircmaxell/password-compat": "dev-master", "ircmaxell/password-compat": "dev-master",
"roave/security-advisories": "dev-master", "roave/security-advisories": "dev-master",
"erusev/parsedown": "1.6.0" "erusev/parsedown": "^1.7"
}, },
"require-dev": { "require-dev": {