]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
Merge remote-tracking branch 'nicolasdanelon/master' into next
authornodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 13:03:01 +0000 (15:03 +0200)
committernodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 13:03:01 +0000 (15:03 +0200)
commitadb1d6c213e64f7a6f4559adbc4d1f69f5a74e62
tree562b0df6cb613a1bfe8b8c3caffb3ee82df67ecd
parent578a84bda0679720f21271ef34de58106c0646fe
parent25c46408a3d5101801574703775cdfd2a0df8d4f
Merge remote-tracking branch 'nicolasdanelon/master' into next
inc/shaarli.css