From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 2 Aug 2018 16:13:33 +0000 (+0200)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=7a5e47eaed48100d3f065a8df9aad51d12bbaa61;p=blog.git

Merge branch 'master' into english
---

7a5e47eaed48100d3f065a8df9aad51d12bbaa61