flow/poblacion-dirigida
1
0
Fork 0
mirror of https://github.com/medialab-prado/poblacion-dirigida.git synced 2024-12-26 01:41:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/medialab-prado/poblacion-dirigida

Browse source
This commit is contained in:
josemolinag 2017-09-28 15:26:34 +02:00
commit 91bf47f0cf
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View file

Binary file not shown.

7
web_files/index.html
View file

@ -24,8 +24,15 @@
<body> <body>
<div class="reveal"> <div class="reveal">
<div class="slides"> <div class="slides">
<<<<<<< HEAD
<section data-background-video="video/videos_nodo/cementerio1.3gp"><h2>Video</h2></section> <section data-background-video="video/videos_nodo/cementerio1.3gp"><h2>Video</h2></section>
<section data-background-iframe=https://desertratilla.carto.com/builder/ce750541-5ea3-4f0c-893b-06263f4e8d34/embed></section> <section data-background-iframe=https://desertratilla.carto.com/builder/ce750541-5ea3-4f0c-893b-06263f4e8d34/embed></section>
=======
<section>Slide 1</section>
<section>Slide 2</section>
<section>Slide 1</section>
<section>Slide 2</section>
>>>>>>> 0b1c73acc9f5646128ab7b707243f54166c58aab
</div> </div>
</div> </div>