]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 18:11:24 +0000 (19:11 +0100)
committerJavier Sancho <jsf@jsancho.org>
Thu, 11 Jan 2018 18:11:24 +0000 (19:11 +0100)
commitd54d8908e2ad36ccd95139f6b947791ac6100912
tree580490e9d89ef626586c93cb0dac641dae0e4447
parent1f7a4c617283706f85d94b5c4925d86d92f510f9
parentbf3407d4cf0fc1bf0a2a2473198096048ed1bcfa
Merge branch 'master' into english
haunt.scm