332 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
abe-	a1e8b7488c	nueva intrudcción	2017-06-18 06:37:13 +02:00
abe-	575fe3f623	nueva intrudcción	2017-06-18 06:28:26 +02:00
abe-	194d3aedb9	nueva intrudcción	2017-06-18 06:25:42 +02:00
abe-	b83dbef318	nueva intrudcción	2017-06-18 06:22:34 +02:00
abe-	83d0fb4c58	Delete index.html	2017-06-18 04:36:11 +02:00
abe-	fad52c4d5d	timeline	2017-06-18 04:33:09 +02:00
abe-	86af12f449	timeline	2017-06-18 04:28:50 +02:00
abe-	acb86c18d2	timeline	2017-06-18 04:25:33 +02:00
abe-	ef1cb617dc	changes.css : header	2017-06-18 01:28:48 +02:00
abe-	3873ea7f2d	changes.css : header	2017-06-18 01:22:25 +02:00
abe-	df20de671c	changes.css : header	2017-06-18 01:20:39 +02:00
abe-	123a94fb24	exprociacion graf 2D	2017-06-18 01:17:49 +02:00
abe-	1e5247cdc8	exprociacion graf 2D	2017-06-18 00:49:49 +02:00
abe-	611fc46561	menu	2017-06-18 00:33:58 +02:00
CarmenPellicerBalsalobre	f23c084a6d	Update colono.md	2017-06-17 21:49:56 +02:00
abe-	72783abf22	parcelas	2017-06-17 21:45:56 +02:00
abe-	5d9f176e22	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 21:42:35 +02:00
abe-	4b4f7c2a24	parcelas	2017-06-17 21:42:24 +02:00
CarmenPellicerBalsalobre	baa055df94	Update mujeres.md	2017-06-17 21:39:35 +02:00
abe-	5fce82e65a	parcelas	2017-06-17 21:38:04 +02:00
abe-	6efb6054b0	parcelas	2017-06-17 21:36:31 +02:00
abe-	14101a68df	parcelas	2017-06-17 21:31:24 +02:00
abe-	b5e7f6a88f	parcelas	2017-06-17 21:11:39 +02:00
abe-	88e150e425	parcelas	2017-06-17 21:09:33 +02:00
abe-	5d92532f0f	parcelas	2017-06-17 21:07:44 +02:00
abe-	aa396b8025	parcelas	2017-06-17 21:06:33 +02:00
abe-	a330ab2e2e	parcelas	2017-06-17 21:04:19 +02:00
abe-	ae86def9f8	parcelas	2017-06-17 20:56:25 +02:00
CarmenPellicerBalsalobre	4178be0ecd	Update mujeres.md	2017-06-17 20:36:24 +02:00
CarmenPellicerBalsalobre	e28a6954c2	Update mujeres.md	2017-06-17 20:26:57 +02:00
Fernando Blat	b58547dc10	ignore sass cache	2017-06-17 20:24:17 +02:00
Fernando Blat	59812988fc	Delete old/	2017-06-17 20:23:33 +02:00
Fernando Blat	0aeba3c38c	Delete and ignore site	2017-06-17 20:22:06 +02:00
CarmenPellicerBalsalobre	2212137e42	Update mujeres.md	2017-06-17 19:54:18 +02:00
CarmenPellicerBalsalobre	f3d7d72ae2	Update mujeres.md	2017-06-17 19:52:36 +02:00
David Prieto	4dafe37244	Update introduccion.md	2017-06-17 19:47:01 +02:00
David Prieto	317a92ce8b	Update introduccion.md	2017-06-17 19:43:53 +02:00
CarmenPellicerBalsalobre	b20ddcad7e	Update mujeres.md	2017-06-17 19:41:09 +02:00
CarmenPellicerBalsalobre	2dad7b5106	Update mujeres.md	2017-06-17 19:40:20 +02:00
CarmenPellicerBalsalobre	3f1b96acf7	Update mujeres.md	2017-06-17 19:39:56 +02:00
CarmenPellicerBalsalobre	029d8f6e9b	Update mujeres.md	2017-06-17 19:37:03 +02:00
CarmenPellicerBalsalobre	2facfedf8b	Update mujeres.md	2017-06-17 19:36:41 +02:00
CarmenPellicerBalsalobre	147a068523	Update mujeres.md	2017-06-17 19:34:56 +02:00
Luis	3a0372b4a1	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 19:33:41 +02:00
Luis	b044042890	adding OpenSans to menu	2017-06-17 19:33:37 +02:00
abe-	53c22c39f9	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 19:15:04 +02:00
abe-	57d764385e	introduccion.md	2017-06-17 19:14:26 +02:00
CarmenPellicerBalsalobre	ee7813375e	Update mujeres.md	2017-06-17 19:14:15 +02:00
abe-	c93e1bf78c	background p5s	2017-06-17 19:11:36 +02:00
Luis	a2c09e2aa1	link color	2017-06-17 19:03:07 +02:00