Difference between revisions of "Template:History of Colombia"

From blackwiki
Jump to navigation Jump to search
imported>Tisquesusa
(linkfix)
(<!--This is NOT a typo. Before Christopher Columbus, not before Colombia -->)
Line 10: Line 10:
 
| heading1 = [[Timeline of Colombian history|Timeline]]
 
| heading1 = [[Timeline of Colombian history|Timeline]]
 
| content1 = {{aligned table|leftright=y|fullwidth=y|nowrap2=y
 
| content1 = {{aligned table|leftright=y|fullwidth=y|nowrap2=y
| [[Indigenous peoples in Colombia|Pre-Colombian period]] | pre-1499
+
| [[Indigenous peoples in Colombia|Pre-Columbian period <!--This is NOT a typo. Before Christopher Columbus, not before Colombia -->]] | pre-1499
 
| [[Spanish conquest of the Muisca|Spanish colonization]] | 1499&ndash;1550
 
| [[Spanish conquest of the Muisca|Spanish colonization]] | 1499&ndash;1550
 
| [[New Kingdom of Granada]]    | 1550&ndash;1717
 
| [[New Kingdom of Granada]]    | 1550&ndash;1717

Revision as of 14:48, 15 January 2017