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

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

commit 7627c31ce1fc0045538769059433422ab0e07bc7
Merge: 6f471ad 2614a5a
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Wed Jun 20 23:18:47 2018 +0200

    Merge branch 'master' into map

 content/images/2018-GUADEC badge-going.png    |  Bin 0 -> 144178 bytes
 content/images/2018-GUADEC badge-going.svg    | 2664 +++++++++++++++++++++++
 content/images/2018-GUADEC badge-speaking.png |  Bin 0 -> 147079 bytes
 content/images/2018-GUADEC badge-speaking.svg | 2787 +++++++++++++++++++++++++
 content/images/2018-GUADEC badge.png          |  Bin 0 -> 136260 bytes
 content/images/2018-GUADEC badge.svg          | 2580 +++++++++++++++++++++++
 content/images/341654213_ea75287d82_m.jpg     |  Bin 0 -> 26282 bytes
 content/images/alsa-ticket.png                |  Bin 0 -> 129672 bytes
 content/images/guadec-badge.png               |  Bin 26487 -> 0 bytes
 content/pages/accommodation.md                |   16 +
 content/pages/map.md                          |    7 +-
 content/pages/materials.md                    |   23 +-
 content/pages/schedule.md                     |    2 +-
 content/pages/sponsors.md                     |    2 +
 content/pages/submit-a-proposal.md            |   10 +-
 content/pages/travel.md                       |   13 +-
 content/pages/venue.md                        |    4 +
 pelicanconf.py                                |    3 +-
 18 files changed, 8097 insertions(+), 14 deletions(-)
---