]> git.jsancho.org Git - blog.git/commitdiff
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Thu, 2 Aug 2018 16:13:33 +0000 (18:13 +0200)
committerJavier Sancho <jsf@jsancho.org>
Thu, 2 Aug 2018 16:13:33 +0000 (18:13 +0200)

Trivial merge