]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge branch 'master' into v0.9
authorVirtualTam <virtualtam@flibidi.net>
Tue, 22 Aug 2017 23:08:41 +0000 (01:08 +0200)
committerVirtualTam <virtualtam@flibidi.net>
Tue, 22 Aug 2017 23:08:41 +0000 (01:08 +0200)

Trivial merge