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

images_datalab/cartel_dataton.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 66 KiB

BIN

images_datalab/medialab_auditorio3_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_gentecurrando3_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_gentecurrando4_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_lab1_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_plantabaja2_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_plantabaja_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_ventana2_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/medialab_ventana_flickr.jpg Normal file

View file

Binary file not shown.

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

BIN

images_datalab/team_JoseLuisEsteban.jpg Normal file

View file

Binary file not shown.

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