]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge branch 'include-doc' into next
authornodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:21:33 +0000 (14:21 +0100)
committernodiscc <nodiscc@gmail.com>
Sun, 15 Mar 2015 13:21:33 +0000 (14:21 +0100)

Trivial merge