mirror of
https://github.com/medialab-prado/datamad2017.git
synced 2024-12-26 20:51:22 +01:00
Merge branch 'master' of https://github.com/medialab-prado/datamad2017
This commit is contained in:
commit
99a0f6355d
1 changed files with 4 additions and 0 deletions
|
@ -44,7 +44,11 @@ c4sponsorsUrl: "/assets/GDG_DevFest_Partnership.pdf"
|
|||
navigationLinks:
|
||||
- {permalink: "/", text: "Home"}
|
||||
- {permalink: "/blog/", text: "Blog"}
|
||||
<<<<<<< HEAD
|
||||
- {permalink: "/schedule/", text: "Agenda"}
|
||||
=======
|
||||
- {permalink: "/schedule/", text: "Programa"}
|
||||
>>>>>>> 35bc9b15177b50fbea6d4a62fe9832a8a82cada0
|
||||
- {permalink: "/speakers/", text: "Ponentes"}
|
||||
- {permalink: "/team/", text: "Equipo"}
|
||||
- {permalink: "/logistics/", text: "Logística"}
|
||||
|
|
Loading…
Reference in a new issue