]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
projects / github / shaarli / Shaarli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c68da3f 38eb1e7)
Merge remote-tracking branch 'nicolasdanelon/master' into next
authornodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 18:45:15 +0000 (20:45 +0200)
committernodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 18:45:15 +0000 (20:45 +0200)

Trivial merge
The personal, minimalist, super-fast, database free, bookmarking service - community repo