]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'upstream/v0.9' into latest
authorVirtualTam <virtualtam@flibidi.net>
Tue, 22 Aug 2017 23:26:03 +0000 (01:26 +0200)
committerVirtualTam <virtualtam@flibidi.net>
Tue, 22 Aug 2017 23:26:03 +0000 (01:26 +0200)
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
Simple merge