]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #379 from ArthurHoaro/plugin-markdown
authorArthur <arthur@hoa.ro>
Sun, 31 Jan 2016 17:57:29 +0000 (18:57 +0100)
committerArthur <arthur@hoa.ro>
Sun, 31 Jan 2016 17:57:29 +0000 (18:57 +0100)
PLUGIN Markdown

1  2 
application/Utils.php
inc/shaarli.css

Simple merge
diff --cc inc/shaarli.css
Simple merge