]> 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: 2fee2f4 a5fbc68)
Merge pull request #901 from shaarli/fix-900
authornodiscc <nodiscc@gmail.com>
Wed, 19 Jul 2017 16:54:00 +0000 (18:54 +0200)
committerGitHub <noreply@github.com>
Wed, 19 Jul 2017 16:54:00 +0000 (18:54 +0200)
Remove merge conflict leftover


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