]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
Merge branch 'pandoc' into next
authornodiscc <nodiscc@gmail.com>
Fri, 10 Apr 2015 18:28:51 +0000 (20:28 +0200)
committernodiscc <nodiscc@gmail.com>
Fri, 10 Apr 2015 18:28:51 +0000 (20:28 +0200)
commitc5db827aee741315cf4789ed63074d6229fe7fba
tree55badac525ec709b688feabbf5c8fcb3cd1cf844
parent1caf20055175d47e0c88785e185e15a481509368
parent6811469e75e35bbf488fe5f7fc5501f483c4a37f
Merge branch 'pandoc' into next