From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 2 Aug 2018 16:14:02 +0000 (+0200)
Subject: Merge branch 'master' into spanish
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=4b61e30547752b2c43d2f001d44ac5a17553b9aa;p=blog.git

Merge branch 'master' into spanish
---

4b61e30547752b2c43d2f001d44ac5a17553b9aa