From: Javier Sancho Date: Wed, 28 Feb 2018 11:29:14 +0000 (+0100) Subject: Merge branch 'master' into spanish X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=ae8a981f0444272331857bafdc18da0c49deedb5;p=blog.git Merge branch 'master' into spanish --- ae8a981f0444272331857bafdc18da0c49deedb5