]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge branch 'master' into v0.12 v0.12 v0.12.1
authorArthurHoaro <arthur@hoa.ro>
Thu, 12 Nov 2020 12:02:36 +0000 (13:02 +0100)
committerArthurHoaro <arthur@hoa.ro>
Thu, 12 Nov 2020 12:02:36 +0000 (13:02 +0100)

Trivial merge