From: Javier Sancho <jsf@jsancho.org>
Date: Mon, 26 Feb 2018 16:02:13 +0000 (+0100)
Subject: Merge branch 'master' into spanish
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=48bc31e7d6e4770020ede089d8851a0178cdea9d

Merge branch 'master' into spanish
---

48bc31e7d6e4770020ede089d8851a0178cdea9d