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

Browse source

...

This commit is contained in:

josemolinag 2017-10-08 08:34:53 +02:00

parent d3edf0af84 4e94d685f2

commit 7a2ea052e3

29 changed files with 163 additions and 115 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

img/people/AdolfoAnton.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB

BIN

img/people/JoseLuisEsteban.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

img/people/VickyBolanos.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 30 KiB

BIN

img/people/VictoriaAnderica.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 21 KiB

BIN

img/sections-background/medialab_auditorio_flickr.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1,011 KiB

BIN

img/venue/medialab_exterior2_architizer.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 359 KiB

BIN

img/venue/medialab_exterior_architizer.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 263 KiB

BIN

img/venue/medialab_gente_currando2_flickr.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 553 KiB

BIN

img/venue/medialab_ropa_flickr.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1 MiB