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

limpieza de conflicto

Browse source
This commit is contained in:
alay 2017-10-08 12:49:42 +02:00
parent 7eec6db91b
commit 28dca6fac6
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
_config.yml
View file

@ -46,11 +46,6 @@ navigationLinks:
- {permalink: "/proyectos/", text: "Proyectos"} - {permalink: "/proyectos/", text: "Proyectos"}
- {permalink: "/ponentes/", text: "Ponentes"} - {permalink: "/ponentes/", text: "Ponentes"}
- {permalink: "/blog/", text: "Blog"} - {permalink: "/blog/", text: "Blog"}
- {permalink: "/schedule/", text: "Programa"}
- {permalink: "/speakers/", text: "Ponentes"}
- {permalink: "/team/", text: "Equipo"}
- {permalink: "/logistics/", text: "Logística"}
- {permalink: "/hackathon/", text: "DataMad"}
- {permalink: "/equipo/", text: "Equipo"} - {permalink: "/equipo/", text: "Equipo"}
bottomNavigationLinks: bottomNavigationLinks:
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"} - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
@ -151,9 +146,6 @@ ticketsOffers:
ticketsNumber: "" ticketsNumber: ""
buyButtonLink: "" buyButtonLink: ""
buyButtonText: "Buy Now" buyButtonText: "Buy Now"
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
validFrom: "2014-08-25T10:00"
validThrough: "2014-09-30T23:59"
ticketContentList: ["Datos Abiertos", "Software Libre"] ticketContentList: ["Datos Abiertos", "Software Libre"]
validFrom: "2017-08-25T10:00" validFrom: "2017-08-25T10:00"
validThrough: "2017-09-30T23:59" validThrough: "2017-09-30T23:59"