]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'virtualtam/travis' into next
authornodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 12:18:04 +0000 (14:18 +0200)
committernodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 12:18:04 +0000 (14:18 +0200)

Trivial merge