From: Javier Sancho <jsf@jsancho.org>
Date: Fri, 23 Feb 2018 09:39:37 +0000 (+0100)
Subject: Merge branch 'master' into spanish
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=5e4986cc73c4568a1ba90784ac919f43789f7235;p=blog.git

Merge branch 'master' into spanish
---

5e4986cc73c4568a1ba90784ac919f43789f7235