Merge pull request #1205 from ArthurHoaro/feature/opengraph

author ArthurHoaro <arthur@hoa.ro>

Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)

committer GitHub <noreply@github.com>

Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)
author ArthurHoaro <arthur@hoa.ro>
Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)
committer GitHub <noreply@github.com>
Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)
diff --cc plugins/markdown/markdown.php
Simple merge
diff --cc tests/plugins/PluginMarkdownTest.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)
committer	GitHub <noreply@github.com>
	Sat, 6 Oct 2018 11:31:07 +0000 (13:31 +0200)
		1	2
plugins/markdown/markdown.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/plugins/PluginMarkdownTest.php	patch \|	diff1 \|	diff2 \|	blob \| history