341 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
guilleciro	8298b98bcd	Update modelos.md	2017-06-17 13:57:02 +02:00
abe-	5b37788724	lista colonos	2017-06-17 13:51:46 +02:00
Luis	61003fb5b3	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 13:50:00 +02:00
Luis	dd40871042	new width column	2017-06-17 13:49:56 +02:00
CarmenPellicerBalsalobre	e7afc9cce1	Update mujeres.md	2017-06-17 13:46:30 +02:00
CarmenPellicerBalsalobre	2ce09d1ae7	Update mujeres.md	2017-06-17 13:45:53 +02:00
abe-	8bd9596fac	img mujeres	2017-06-17 13:42:11 +02:00
CarmenPellicerBalsalobre	74c9db3bd8	Update colono.md	2017-06-17 13:35:39 +02:00
CarmenPellicerBalsalobre	c798bb948a	Update colono.md	2017-06-17 13:33:40 +02:00
abe-	9b22130643	rename mapa.html	2017-06-17 13:28:16 +02:00
David Prieto	5ed47ac81b	Update index.md	2017-06-17 13:24:39 +02:00
abe-	f8e7591dfd	index.md	2017-06-17 13:23:43 +02:00
abe-	63e9d34c7c	index.md	2017-06-17 13:21:52 +02:00
abe-	39c692ec8d	mapa.html	2017-06-17 13:19:49 +02:00
Luis	581d0f65a1	resizing iFrames to 100%	2017-06-17 13:18:25 +02:00
abe-	0aee348b5b	resize imgs	2017-06-17 13:16:19 +02:00
CarmenPellicerBalsalobre	02d65fa3da	Update colono.md	2017-06-17 12:58:24 +02:00
guilleciro	227ed56200	Update presos.md	2017-06-17 12:56:17 +02:00
CarmenPellicerBalsalobre	0501b3a3b2	Update colono.md	2017-06-17 12:54:31 +02:00
abe-	b193d6e0e0	css	2017-06-17 12:50:20 +02:00
CarmenPellicerBalsalobre	f56901728a	Update colono.md	2017-06-17 12:50:02 +02:00
abe-	51617fabb0	css	2017-06-17 12:42:22 +02:00
abe-	e7ed3be9ca	css	2017-06-17 12:38:28 +02:00
abe-	cd3487b7d5	css	2017-06-17 12:34:51 +02:00
guilleciro	a933f737d7	Update presos.md	2017-06-17 12:16:30 +02:00
CarmenPellicerBalsalobre	9b4de7c52f	Update colono.md	2017-06-17 12:04:13 +02:00
abe-	690f8593e2	Update mecanismos-expropiacion.md	2017-06-17 11:40:08 +02:00
abe-	89f7cb3cbe	Update mecanismos-expropiacion.md	2017-06-17 11:39:16 +02:00
abe-	991e607bea	leaflet	2017-06-17 11:18:33 +02:00
CarmenPellicerBalsalobre	0b7793eed9	Update colono.md	2017-06-17 11:17:12 +02:00
abe-	b43e78521d	leaflet	2017-06-17 11:11:23 +02:00
abe-	510f3cac46	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 11:10:17 +02:00
abe-	2e89a4e08d	leaflet	2017-06-17 11:10:00 +02:00
CarmenPellicerBalsalobre	e736d879d7	Update colono.md	2017-06-17 11:09:29 +02:00
abe-	fbf764a350	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 11:06:52 +02:00
CarmenPellicerBalsalobre	044f3a57e8	Update colono.md	2017-06-17 11:06:15 +02:00
abe-	1d7b45f69d	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 11:05:58 +02:00
abe-	a2ef2a7f0c	leaflet	2017-06-17 11:05:22 +02:00
CarmenPellicerBalsalobre	fa0e57d33f	Update colono.md	2017-06-17 10:48:55 +02:00
abe-	3b2337da69	subtitle	2017-06-17 03:20:45 +02:00
abe-	16cbb8384b	subtitle	2017-06-17 03:08:17 +02:00
abe-	e463363019	subtitle	2017-06-17 03:06:55 +02:00
abe-	a510c06e7e	subtitle	2017-06-17 03:01:43 +02:00
abe-	42ac2b4e8f	subtitle	2017-06-17 02:58:16 +02:00
abe-	f78a3f7ca0	subtitle	2017-06-17 02:57:38 +02:00
abe-	dc868e960b	subtitle	2017-06-17 02:56:38 +02:00
abe-	97e812e34e	subtitle	2017-06-17 02:55:56 +02:00
abe-	13e74c0481	subtitle	2017-06-17 02:55:24 +02:00
abe-	b7a8d5394e	subtitle	2017-06-17 02:49:04 +02:00
abe-	a0e7436fff	subtitle	2017-06-17 00:59:18 +02:00