]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into spanish
authorJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 18:11:05 +0000 (19:11 +0100)
committerJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 18:11:05 +0000 (19:11 +0100)
commitf2477e8ea7a9cfbb91703b8ad671f6c78e36081d
tree0d89fc44c26ca1de362bb4f61d3e522a7adc379d
parent2f8a460bafe62b7865d02d656e8a0ff7c0eb9f09
parentbf3407d4cf0fc1bf0a2a2473198096048ed1bcfa
Merge branch 'master' into spanish
haunt.scm