]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Wed, 28 Feb 2018 11:29:31 +0000 (12:29 +0100)
committerJavier Sancho <jsf@jsancho.org>
Wed, 28 Feb 2018 11:29:31 +0000 (12:29 +0100)
commit222184207ce31c9588c7c3cd5533469ae13a74ec
tree56e0e30fb7ad09e6c7e6affb2136d396af2099e3
parent871680aeaace3977f22a937446bd17db6dd50432
parentc5d5ac26328e5010cbf0d3f65ed9206fbb5e0e02
Merge branch 'master' into english
haunt.scm