[guadec-web: 8/9] Merge branch 'master' into map

[Ismael Olea <olea src gnome org>]

commit c946c1980370318497d2dd821cd32098004aab9b
Merge: 86722bb 9f44e37
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Mon Jun 18 23:03:30 2018 +0200

    Merge branch 'master' into map

 .../images/640px-F\303\272tbol_playa_(8181486225).jpg"  | Bin 0 -> 60771 bytes
 content/pages/social-events.md                          |   8 ++++++--
 pelicanconf.py                                          |   1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
---