]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge branch 'master' into v0.11
authorArthurHoaro <arthur@hoa.ro>
Sat, 3 Aug 2019 07:54:11 +0000 (09:54 +0200)
committerArthurHoaro <arthur@hoa.ro>
Sat, 3 Aug 2019 07:54:11 +0000 (09:54 +0200)

Trivial merge