[guadec-web: 2/3] Merge branch 'master' into map

[Oliver Gutiérrez <ogutierrez src gnome org>]

commit 8c79c6459fb9e8798328fd704efc6409559f157b
Merge: c4ce2e0 e67544f
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Sat Jun 30 12:56:41 2018 +0200

    Merge branch 'master' into map

 .../187px-Bathing_suit_MET_1979.346.18ab.jpeg      | Bin 0 -> 8312 bytes
 content/images/320px-Paella_1719081168.jpg         | Bin 0 -> 23953 bytes
 content/images/640px-Terraza_del_Mar_(front).jpg   | Bin 0 -> 61625 bytes
 content/images/civitas-tapas.jpg                   | Bin 0 -> 255625 bytes
 content/images/gnome_karate_girl_by_pookstar.png   | Bin 0 -> 259674 bytes
 content/images/ice-cream-death-match-420x280.jpg   | Bin 0 -> 59066 bytes
 content/images/sponsors/igalia.png                 | Bin 142525 -> 39740 bytes
 content/images/sponsors/opensuse.png               | Bin 318090 -> 40645 bytes
 .../terraza-del-mar-5650_2016_apr_15_13_01_41.jpg  | Bin 0 -> 107839 bytes
 content/pages/about-the-city.es.md                 |  59 ++++++++++++++
 content/pages/about-the-city.md                    |  36 ++++-----
 content/pages/code-of-conduct.md                   |  18 +++++
 content/pages/schedule.md                          |  11 ---
 content/pages/social-events.md                     |  85 ++++++++++++++++++++-
 content/pages/sponsors.md                          |  12 ++-
 pelicanconf.py                                     |   4 +-
 src/haml/article.haml                              |  20 ++---
 src/haml/base/base.haml                            |   2 +
 src/haml/page.haml                                 |   2 +-
 src/sass/noscript.sass                             |   2 +
 20 files changed, 204 insertions(+), 47 deletions(-)
---