]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into spanish
authorJavier Sancho <jsf@jsancho.org>
Tue, 13 Feb 2018 11:31:17 +0000 (12:31 +0100)
committerJavier Sancho <jsf@jsancho.org>
Tue, 13 Feb 2018 11:31:17 +0000 (12:31 +0100)
commit8003b14f44b06527b6c5f1d77650c2edc7af55e9
tree24d1a92788a2476723cf2346dac1176e80bc6479
parentf2477e8ea7a9cfbb91703b8ad671f6c78e36081d
parentac2f9b37051f24e6214268b5bc050a66f9b3e592
Merge branch 'master' into spanish
haunt.scm