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

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

Browse source
This commit is contained in:
josemolinag 2017-10-07 22:58:22 +02:00
commit 99a0f6355d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_config.yml
View file

@ -44,7 +44,11 @@ c4sponsorsUrl: "/assets/GDG_DevFest_Partnership.pdf"
navigationLinks: navigationLinks:
- {permalink: "/", text: "Home"} - {permalink: "/", text: "Home"}
- {permalink: "/blog/", text: "Blog"} - {permalink: "/blog/", text: "Blog"}
<<<<<<< HEAD
- {permalink: "/schedule/", text: "Agenda"} - {permalink: "/schedule/", text: "Agenda"}
=======
- {permalink: "/schedule/", text: "Programa"}
>>>>>>> 35bc9b15177b50fbea6d4a62fe9832a8a82cada0
- {permalink: "/speakers/", text: "Ponentes"} - {permalink: "/speakers/", text: "Ponentes"}
- {permalink: "/team/", text: "Equipo"} - {permalink: "/team/", text: "Equipo"}
- {permalink: "/logistics/", text: "Logística"} - {permalink: "/logistics/", text: "Logística"}