415 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
CarmenPellicerBalsalobre	10ef899a97	Update colono.md	2017-06-18 12:11:50 +02:00
Luis	70c47bbac1	adding img 100%	2017-06-18 12:10:20 +02:00
Luis	2a02166502	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:07:27 +02:00
Luis	994b9fe022	blockquotes	2017-06-18 12:07:23 +02:00
abe-	ee954d9f45	titulos	2017-06-18 12:03:49 +02:00
Luis	2dc8b0457a	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:01:38 +02:00
Luis	71ad38b1b9	blockquotes on fixes on small devices	2017-06-18 12:01:34 +02:00
abe-	47c581d20b	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 11:59:06 +02:00
abe-	9bdbacd066	titulos	2017-06-18 11:58:57 +02:00
David Prieto	0426b9419e	Update introduccion.md	2017-06-18 11:58:57 +02:00
Luis	68c25d5232	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 11:58:10 +02:00
Luis	94d768144c	slider works/shows right on mobile	2017-06-18 11:58:06 +02:00
David Prieto	17025d3d29	Update introduccion.md	2017-06-18 11:55:51 +02:00
CarmenPellicerBalsalobre	ab95e6c214	Update autoritario.md	2017-06-18 11:54:42 +02:00
Luis	7cb1a70d52	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 11:50:37 +02:00
Luis	fe87b9ffbd	year shows right	2017-06-18 11:50:32 +02:00
abe-	fadf252f3f	titulos	2017-06-18 11:50:02 +02:00
Luis	6263cedc37	less map width on small devices	2017-06-18 11:42:34 +02:00
Luis	4d0c9b72cc	adding jQuery touch	2017-06-18 11:39:35 +02:00
Luis	64b2a3dc37	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 11:35:18 +02:00