]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 16:25:44 +0000 (17:25 +0100)
committerJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 16:25:44 +0000 (17:25 +0100)
commit1f7a4c617283706f85d94b5c4925d86d92f510f9
tree071280e081f91423b5a54a11f808100cd31631bf
parent471c18b13cd29667b20ed8f1ca17a41da344dac6
parent7a222c712a210d28db4a791cbd1228b7af2cf0d6
Merge branch 'master' into english
haunt.scm