]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #391 from nicolasdanelon/patch-1
authorArthur <arthur@hoa.ro>
Wed, 25 Nov 2015 14:07:20 +0000 (15:07 +0100)
committerArthur <arthur@hoa.ro>
Wed, 25 Nov 2015 14:07:20 +0000 (15:07 +0100)
json_encode removed


Trivial merge