]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Mon, 26 Feb 2018 16:06:34 +0000 (17:06 +0100)
committerJavier Sancho <jsf@jsancho.org>
Mon, 26 Feb 2018 16:06:34 +0000 (17:06 +0100)
commit16b2c33322417be6d88ecb431116c8fcdd0677d1
tree0cd8c1c8fbbce8ba5da357a11353bc0c80e74c2e
parent3ae82e7780aeacd88854dba6294732a9d6f62257
parentbf75bbf48ffb7e81c8ded9fe740ddc944ccf0c78
Merge branch 'master' into english
haunt.scm