]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'nicolasdanelon/master' into next
authornodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 13:03:01 +0000 (15:03 +0200)
committernodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 13:03:01 +0000 (15:03 +0200)
1  2 
inc/shaarli.css

diff --cc inc/shaarli.css
Simple merge