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

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

commit e304a145e98c593a74c72befdc212f259c529766
Merge: d2e2d40 1d2b8d8
Author: Jorge Sanz <xurxosanz gmail com>
Date:   Tue Jun 26 13:07:15 2018 +0200

    Merge branch 'master' into map

 content/documents/schedule.xml    |   1 +
 content/images/sponsors/arm.png   | Bin 0 -> 4243 bytes
 content/pages/contact.eo.md       |  10 ++++++
 content/pages/contact.md          |   4 +--
 content/pages/schedule.md         |   6 +++-
 content/pages/sponsors.md         |   2 ++
 content/pages/talks-and-events.md |  15 ++++++++
 pelicanconf.py                    |   4 ++-
 src/sass/screen.sass              |  70 ++++++++++++++++++++++++++++++++++++++
 9 files changed, 108 insertions(+), 4 deletions(-)
---