]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'parent/master' into v0.12
authorArthurHoaro <arthur@hoa.ro>
Tue, 13 Oct 2020 09:49:45 +0000 (11:49 +0200)
committerArthurHoaro <arthur@hoa.ro>
Tue, 13 Oct 2020 09:49:45 +0000 (11:49 +0200)

Trivial merge