435 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
abe-	0c5e61b7a9	cambios introduccion contexto	2017-06-19 11:59:45 +02:00
abe-	4b8a13260b	cambios introduccion contexto	2017-06-19 11:56:47 +02:00
abe-	57a12b6a15	cambios introduccion contexto	2017-06-19 11:40:59 +02:00
abe-	6d45224137	cita introducción contexto	2017-06-19 11:32:17 +02:00
abe-	4e6d3c0cb6	eliminados archivos en desuso	2017-06-19 11:30:50 +02:00
abe-	d4adb5a891	eliminados archivos en desuso	2017-06-19 11:28:58 +02:00
abe-	906df499a6	eliminados archivos en desuso	2017-06-19 11:25:22 +02:00
abe-	ce41ae5f0c	cambios en modelos.md	2017-06-19 11:18:17 +02:00
abe-	d80358be73	rebuild pages	2017-06-19 11:13:49 +02:00
abe-	3bfdfef861	cambios en modelos.md	2017-06-19 11:12:35 +02:00
abe-	dfd0a05946	rebuild pages	2017-06-19 10:03:03 +02:00
abe-	a02051d47e	parcelas	2017-06-19 09:55:53 +02:00
abe-	98206f69a4	title en layout	2017-06-19 09:51:26 +02:00
abe-	901dbb2e25	leve	2017-06-19 09:39:22 +02:00
abe-	ff3da7ff2d	parcelas	2017-06-19 01:22:28 +02:00
abe-	48a9d46474	site title en index	2017-06-19 01:16:35 +02:00
abe-	1baedeb6c3	site title en index	2017-06-19 01:13:21 +02:00
abe-	18798f3bd3	modifs urbanismo	2017-06-19 01:08:17 +02:00
abe-	223ea2a312	modifs urbanismo	2017-06-19 01:02:28 +02:00
abe-	25e626fc9a	modifs urbanismo	2017-06-19 00:55:22 +02:00
abe-	f37f2b0f37	chgs intro index.md	2017-06-19 00:52:28 +02:00
abe-	e1ac5cdc03	chgs intro index.md	2017-06-19 00:51:15 +02:00
abe-	3158792c65	chgs intro index.md	2017-06-19 00:48:58 +02:00
abe-	8ccf2bfb3c	chgs intro index.md	2017-06-19 00:12:43 +02:00
abe-	054ee02f5d	chgs intro index.md	2017-06-18 23:59:00 +02:00
abe-	5ace8a8bf8	conflict merge resolved	2017-06-18 23:58:08 +02:00
abe-	62480d75a3	conflict merge resolved	2017-06-18 23:56:56 +02:00
Luis	169203f4c1	new title on 'Modernismo en el camop'	2017-06-18 13:31:24 +02:00
Luis	fecbce6593	adding caption	2017-06-18 13:12:51 +02:00
Luis	86c3f38fcf	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:52:49 +02:00
Luis	ddea6e06e4	desktop blockquotes	2017-06-18 12:52:45 +02:00
CarmenPellicerBalsalobre	514c74f53f	Update mujeres.md	2017-06-18 12:49:13 +02:00
Luis	ee41ade2fa	new woman pg title	2017-06-18 12:46:45 +02:00
CarmenPellicerBalsalobre	3b153416f2	Update colono.md	2017-06-18 12:44:47 +02:00
abe-	7e50d1ee0f	titulos	2017-06-18 12:44:23 +02:00
CarmenPellicerBalsalobre	1e81b078c5	Update mujeres.md	2017-06-18 12:41:41 +02:00
Luis	258465dffd	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:41:11 +02:00
Luis	0595c568f3	rm default font-awesome icons	2017-06-18 12:41:06 +02:00
CarmenPellicerBalsalobre	46634e348a	Update colono.md	2017-06-18 12:40:57 +02:00
CarmenPellicerBalsalobre	ef7342d8ce	Update colono.md	2017-06-18 12:37:56 +02:00
Luis	23b5483815	new aspect on banner	2017-06-18 12:33:06 +02:00
Luis	52ddba08e6	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:28:57 +02:00
Luis	33a05fd711	adding header logo	2017-06-18 12:28:52 +02:00
guilleciro	7450711e8d	Update presos.md	2017-06-18 12:23:25 +02:00
abe-	398cdc1dd8	about	2017-06-18 12:20:08 +02:00
guilleciro	97bdf4b00c	Update mecanismos-expropiacion.md	2017-06-18 12:17:55 +02:00
guilleciro	ba44b4dcc5	Update mecanismos-expropiacion.md	2017-06-18 12:15:09 +02:00
Luis	542efeed17	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:13:15 +02:00
Luis	d89a01e675	fix markdown link on autoritario	2017-06-18 12:13:10 +02:00
abe-	07b8441796	titulos	2017-06-18 12:12:07 +02:00