]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #275 from shaarli/plugin-proposition
authorArthur <arthur@hoa.ro>
Sun, 8 Nov 2015 12:29:32 +0000 (13:29 +0100)
committerArthur <arthur@hoa.ro>
Sun, 8 Nov 2015 12:29:32 +0000 (13:29 +0100)
Plugin proposition

1  2 
index.php

diff --cc index.php
Simple merge