From: Keith Carangelo Date: Wed, 2 Sep 2020 15:38:56 +0000 (-0400) Subject: Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_page X-Git-Tag: v0.12.0-beta-1~13^2~1^2 X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=82fcace8fc4288254952efd1fdafd7dc5a6f9a20 Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_page --- 82fcace8fc4288254952efd1fdafd7dc5a6f9a20