[guadec-web: 4/6] Merge branch 'master' into map

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

commit e4d8b8a8859ff4345114c67054b1f79cf5de8693
Merge: 9ed82a8 d0ae90b
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Mon Jul 2 11:15:22 2018 +0200

    Merge branch 'master' into map

 .../2017-01-26-gala-suerte-cervantes-239.jpg       | Bin 0 -> 139303 bytes
 .../2017-01-26-gala-suerte-cervantes-312.jpg       | Bin 0 -> 123194 bytes
 .../images/chinelita/patio-naranjos-guitarra.jpg   | Bin 0 -> 111640 bytes
 content/images/chinelita/patio-naranjos.jpg        | Bin 0 -> 1796814 bytes
 .../320px-Alcazaba_de_Almer\303\255a.jpg"          | Bin 0 -> 24747 bytes
 .../360px-Entrada_Alcazaba_Almer\303\255a.JPG"     | Bin 0 -> 56521 bytes
 .../images/guided-visit/IMG_20180507_104455.jpg    | Bin 0 -> 40535 bytes
 content/images/guided-visit/PROMO-8-255x255.jpg    | Bin 0 -> 16773 bytes
 .../guided-visit/PUBLICO-EN-GENERAL1-255x255.jpg   | Bin 0 -> 27868 bytes
 .../UN-PASADO-FASCINANTE-2-255x255.jpg             | Bin 0 -> 33812 bytes
 .../Walkway_Alcazaba,_Almeria,_Spain.jpg           | Bin 0 -> 71585 bytes
 content/pages/accommodation.md                     |   1 +
 content/pages/map.md                               |  67 ++++++++++------
 content/pages/schedule.md                          |  10 +--
 content/pages/social-events.md                     |  84 ++++++++++++++++++---
 content/pages/travel.md                            |   1 +
 content/pages/venue.md                             |   2 +-
 17 files changed, 123 insertions(+), 42 deletions(-)
---