Commit graph

465 commits

Author SHA1 Message Date
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
abe-
e0150870a6 subtitle 2017-06-17 00:52:20 +02:00
CarmenPellicerBalsalobre
27020d5615 Update colono.md 2017-06-16 19:23:27 +02:00
CarmenPellicerBalsalobre
4da80f0f1f Update colono.md 2017-06-16 19:10:53 +02:00
abe-
8de3f41fd5 presos timeline 2017-06-16 18:29:47 +02:00
abe-
d89ea4b0de presos timeline 2017-06-16 18:13:32 +02:00
abe-
d09b115e0f presos timeline 2017-06-16 18:13:05 +02:00
abe-
fde8568496 presos timeline 2017-06-16 17:57:25 +02:00
abe-
92ba357bbf presos timeline 2017-06-16 17:14:17 +02:00
CarmenPellicerBalsalobre
215964a52d Update autoritario.md 2017-06-16 14:55:25 +02:00
CarmenPellicerBalsalobre
10c94be9bf Update autoritario.md 2017-06-16 12:33:50 +02:00
CarmenPellicerBalsalobre
84ba5f5537 Update autoritario.md 2017-06-16 12:32:58 +02:00
CarmenPellicerBalsalobre
656cd51534 Update autoritario.md 2017-06-16 12:26:39 +02:00
CarmenPellicerBalsalobre
16727e93a4 Update autoritario.md 2017-06-16 12:26:03 +02:00
CarmenPellicerBalsalobre
7a2610275a Update autoritario.md 2017-06-16 12:25:12 +02:00
CarmenPellicerBalsalobre
d4c1791d61 Update contexto.md 2017-06-16 12:23:59 +02:00
CarmenPellicerBalsalobre
3f807c265e Update autoritario.md 2017-06-16 12:23:13 +02:00
CarmenPellicerBalsalobre
19161b2c11 Update contexto.md 2017-06-16 12:16:04 +02:00
abe-
4a508d82a7 Update index.md 2017-06-16 11:52:23 +02:00
abe-
806f75ea67 Update index.md 2017-06-16 11:50:23 +02:00
abe-
6d3c5a346b Update index.md 2017-06-16 11:49:05 +02:00
abe-
d32bacf21f Update index.md 2017-06-16 11:48:27 +02:00
abe-
1eadde9edf Update index.md 2017-06-16 11:47:44 +02:00
abe-
8b9aab6314 icon 2017-06-15 14:09:12 +02:00
abe-
dc9b1c418d icon 2017-06-15 14:07:18 +02:00
abe-
d156ff5465 icon 2017-06-15 13:58:36 +02:00
abe-
a76fff067b icon 2017-06-15 13:57:04 +02:00