Merge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks
authorMichael Vogel <icarus@dabo.de>
Mon, 15 Jan 2018 00:37:13 +0000 (01:37 +0100)
committerGitHub <noreply@github.com>
Mon, 15 Jan 2018 00:37:13 +0000 (01:37 +0100)
Fix Diaspora LF in code blocks/Move php-markdown to composer


Trivial merge