]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge branch 'master' into v0.9
authorArthurHoaro <arthur@hoa.ro>
Sat, 7 Oct 2017 10:22:54 +0000 (12:22 +0200)
committerArthurHoaro <arthur@hoa.ro>
Sat, 7 Oct 2017 10:22:54 +0000 (12:22 +0200)

Trivial merge