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

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

commit 05d05ef3a40b527f4ad79f259f3389024d713648
Merge: 6af4b54 c2daca4
Author: Oliver Gutiérrez <ogutsua gmail com>
Date:   Wed Jun 27 12:18:57 2018 +0000

    Merge branch 'map' into 'master'
    
    using absolute url from guadec website
    
    See merge request Infrastructure/guadec-web!26

 src/js/guadec_map/guadec-map-style.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---