]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
More merge mess up fixes
authorArthurHoaro <arthur@hoa.ro>
Sun, 18 Dec 2016 13:32:41 +0000 (14:32 +0100)
committerArthurHoaro <arthur@hoa.ro>
Sun, 18 Dec 2016 13:32:41 +0000 (14:32 +0100)
commitde92edd6dd6c09625d0acda8009ebbed86b98f47
tree0e8db8f30404dace020e8e7616547d2ca4c88ed6
parent79a0dfe9cc658cbfafebac0aa9f1c2953faff777
More merge mess up fixes
application/FeedBuilder.php
tests/plugins/PluginMarkdownTest.php