]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #140 from nodiscc/master
authornodiscc <nodiscc@gmail.com>
Thu, 5 Mar 2015 12:44:40 +0000 (13:44 +0100)
committernodiscc <nodiscc@gmail.com>
Thu, 5 Mar 2015 12:44:40 +0000 (13:44 +0100)
Various fixes


Trivial merge