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

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

commit 3b30f20af6a533471f2deae527be2a6260cbed9a
Merge: e67544f 8c79c64
Author: Oliver Gutiérrez <ogutsua gmail com>
Date:   Sat Jun 30 22:49:00 2018 +0000

    Merge branch 'map' into 'master'
    
    Map v3
    
    See merge request Infrastructure/guadec-web!29

 content/pages/map.md            | 133 +++++-----
 src/js/guadec_map/guadec-map.js | 536 +++++++++++++++++++++++++++-------------
 2 files changed, 441 insertions(+), 228 deletions(-)
---