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

[Tom Tryfonidis <tomtryf src gnome org>]

commit 36b29653833881c9fe3afc4bd8baab199b9edf30
Merge: d618016 b279b3c
Author: Tom Tryfonidis <tomtryf gmail com>
Date:   Fri Sep 28 12:27:32 2018 +0000

    Merge branch 'master' into 'master'
    
    Land website for GUADEC 2019
    
    See merge request Infrastructure/guadec-web!35

 content/documents/schedule.xml                     |    9 -
 content/endless-sponsorship.md                     |   17 -
 content/images/16-9-2.jpg                          |  Bin 30010 -> 0 bytes
 content/images/16-9.jpg                            |  Bin 36384 -> 0 bytes
 .../187px-Bathing_suit_MET_1979.346.18ab.jpeg      |  Bin 8312 -> 0 bytes
 content/images/2018-GUADEC badge-going.png         |  Bin 144178 -> 0 bytes
 content/images/2018-GUADEC badge-going.svg         | 2664 -------------------
 content/images/2018-GUADEC badge-speaking.png      |  Bin 147079 -> 0 bytes
 content/images/2018-GUADEC badge-speaking.svg      | 2787 --------------------
 content/images/2018-GUADEC badge.png               |  Bin 136260 -> 0 bytes
 content/images/2018-GUADEC badge.svg               | 2580 ------------------
 content/images/320px-Paella_1719081168.jpg         |  Bin 23953 -> 0 bytes
 content/images/341654213_ea75287d82_m.jpg          |  Bin 26282 -> 0 bytes
 .../640px-F\303\272tbol_playa_(8181486225).jpg"    |  Bin 60771 -> 0 bytes
 content/images/640px-Terraza_del_Mar_(front).jpg   |  Bin 61625 -> 0 bytes
 content/images/640px-Universidad_almeria.jpg       |  Bin 73171 -> 0 bytes
 content/images/CAMPUS_DESDE_EL_AULARIO_I_04.jpg    |  Bin 257979 -> 0 bytes
 content/images/UAL-from-sea-_MG_6831.jpg           |  Bin 213486 -> 0 bytes
 content/images/UAL-plan.png                        |  Bin 189241 -> 0 bytes
 content/images/a-iv-hall.jpg                       |  Bin 68183 -> 0 bytes
 content/images/a-iv.jpg                            |  Bin 100783 -> 0 bytes
 content/images/acmarriot.jpg                       |  Bin 299245 -> 0 bytes
 content/images/acmarriott.jpg                      |  Bin 299245 -> 0 bytes
 content/images/alsa-ticket.png                     |  Bin 129672 -> 0 bytes
 content/images/auditorium-inside.jpg               |  Bin 98857 -> 0 bytes
 content/images/auditorium.jpg                      |  Bin 129561 -> 0 bytes
 content/images/avenida.jpg                         |  Bin 252451 -> 0 bytes
 content/images/cafeteria-outside.jpg               |  Bin 103713 -> 0 bytes
 content/images/cafeteria.jpg                       |  Bin 86732 -> 0 bytes
 content/images/childcare.jpg                       |  Bin 1612986 -> 0 bytes
 .../2017-01-26-gala-suerte-cervantes-239.jpg       |  Bin 139303 -> 0 bytes
 .../2017-01-26-gala-suerte-cervantes-312.jpg       |  Bin 123194 -> 0 bytes
 .../images/chinelita/patio-naranjos-guitarra.jpg   |  Bin 111640 -> 0 bytes
 content/images/chinelita/patio-naranjos.jpg        |  Bin 1796814 -> 0 bytes
 content/images/civitas-tapas.jpg                   |  Bin 255625 -> 0 bytes
 content/images/conference-brochure-2018-web.pdf    |  Bin 1123857 -> 0 bytes
 content/images/costasol.jpg                        |  Bin 28462 -> 0 bytes
 content/images/elba.jpg                            |  Bin 139281 -> 0 bytes
 content/images/embajador.jpg                       |  Bin 50459 -> 0 bytes
 content/images/empty.png                           |  Bin 168 -> 0 bytes
 content/images/gnome_karate_girl_by_pookstar.png   |  Bin 259674 -> 0 bytes
 .../group_photo-28434184137_f3102ac89e_b.jpg       |  Bin 333899 -> 0 bytes
 .../320px-Alcazaba_de_Almer\303\255a.jpg"          |  Bin 24747 -> 0 bytes
 .../360px-Entrada_Alcazaba_Almer\303\255a.JPG"     |  Bin 56521 -> 0 bytes
 .../images/guided-visit/IMG_20180507_104455.jpg    |  Bin 40535 -> 0 bytes
 content/images/guided-visit/PROMO-8-255x255.jpg    |  Bin 16773 -> 0 bytes
 .../guided-visit/PUBLICO-EN-GENERAL1-255x255.jpg   |  Bin 27868 -> 0 bytes
 .../UN-PASADO-FASCINANTE-2-255x255.jpg             |  Bin 33812 -> 0 bytes
 .../Walkway_Alcazaba,_Almeria,_Spain.jpg           |  Bin 71585 -> 0 bytes
 content/images/hotel-catedral-almeria.jpg          |  Bin 49624 -> 0 bytes
 .../images/hotel-torreluz-centro-almera-011.jpg    |  Bin 67565 -> 0 bytes
 content/images/how-to-sponsor-1.jpg                |  Bin 255655 -> 0 bytes
 content/images/how-to-sponsor-2.jpg                |  Bin 744923 -> 0 bytes
 content/images/how-to-sponsor-3.jpg                |  Bin 299151 -> 0 bytes
 content/images/how-to-sponsor-4.jpg                |  Bin 214592 -> 0 bytes
 content/images/how-to-sponsor-5.jpg                |  Bin 1267535 -> 0 bytes
 content/images/how-to-sponsor-6.jpg                |  Bin 147048 -> 0 bytes
 content/images/ice-cream-death-match-420x280.jpg   |  Bin 59066 -> 0 bytes
 content/images/nh.jpg                              |  Bin 66180 -> 0 bytes
 content/images/nuevo-torreluz.jpg                  |  Bin 460128 -> 0 bytes
 content/images/sercotel.jpg                        |  Bin 108997 -> 0 bytes
 content/images/sponsors/arm.png                    |  Bin 4243 -> 0 bytes
 content/images/sponsors/canonical.png              |  Bin 23895 -> 0 bytes
 content/images/sponsors/codethink.png              |  Bin 44962 -> 0 bytes
 content/images/sponsors/collabora.png              |  Bin 12269 -> 0 bytes
 content/images/sponsors/endless.png                |  Bin 11904 -> 0 bytes
 content/images/sponsors/gitlab.png                 |  Bin 50682 -> 0 bytes
 content/images/sponsors/google.png                 |  Bin 4873 -> 0 bytes
 content/images/sponsors/igalia.png                 |  Bin 39740 -> 0 bytes
 content/images/sponsors/mozilla.png                |  Bin 8068 -> 0 bytes
 content/images/sponsors/opensuse.png               |  Bin 40645 -> 0 bytes
 content/images/sponsors/pia.png                    |  Bin 18779 -> 0 bytes
 content/images/sponsors/redhat.png                 |  Bin 36111 -> 0 bytes
 .../terraza-del-mar-5650_2016_apr_15_13_01_41.jpg  |  Bin 107839 -> 0 bytes
 content/images/torreluz-centro-7.jpg               |  Bin 140552 -> 0 bytes
 content/images/tryp-indalo.jpg                     |  Bin 20756 -> 0 bytes
 content/images/ual21-aerea.jpg                     |  Bin 411010 -> 0 bytes
 content/news-2018061101.md                         |   17 -
 content/pages/about-the-city.es.md                 |   59 -
 content/pages/contact.eo.md                        |   10 -
 content/redhat-sponsoring.md                       |   11 -
 pelicanconf.py                                     |  100 +-
 src/haml/index.haml                                |    6 +-
 src/img/skyline.png                                |  Bin 16269 -> 409423 bytes
 src/sass/screen.sass                               |    3 +-
 85 files changed, 55 insertions(+), 8208 deletions(-)
---