]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
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)
commit96f70777f77a4e30ebc95bd2bf2e11371afbbbab
treeb147b3b43c045082e2ca53a823f95ec7b1c431e8
parent2fee2f425d244e50ff64416f302a941a4470d8d2
parenta5fbc689f8989ffd1181af4530a932dd0f1ed76b
Merge pull request #901 from shaarli/fix-900

Remove merge conflict leftover