From: Javier Sancho <jsf@jsancho.org>
Date: Wed, 28 Feb 2018 11:43:09 +0000 (+0100)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=01ffe1178b7017dcb2ae11bec265f4316c79383a;p=blog.git

Merge branch 'master' into english
---

01ffe1178b7017dcb2ae11bec265f4316c79383a