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

Browse source

...

This commit is contained in:

josemolinag 2017-10-07 23:36:24 +02:00

parent 5abcb12a3e 88e0cf6c86

commit a73404e216

2 changed files with 4 additions and 2 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/sections-background/medialab_gente_currando2_flickr.jpg Normal file

View file

Binary file not shown.

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