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

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

commit a35051eb01f8c1c2cc3b3da088f3b8de028e6492
Merge: fd23e31 a731204
Author: Oliver Gutiérrez <ogutsua gmail com>
Date:   Fri Jul 6 08:42:54 2018 +0000

    Merge branch 'map' into 'master'
    
    Map routes with waypoints
    
    See merge request Infrastructure/guadec-web!34

 content/pages/map.md            | 19 ++++---------------
 src/js/guadec_map/guadec-map.js | 32 ++++++++++++--------------------
 2 files changed, 16 insertions(+), 35 deletions(-)
---