Difference between revisions of "Template:Campaignbox Franco-Moroccan conflicts"

From blackwiki
Jump to navigation Jump to search
(Medieval????)
imported>Omar-Toons
(Undid revision 497520890 by 188.76.235.63 (talk) rv Bokpasa's block evasion)
Line 2: Line 2:
 
|name=Franco-Moroccan conflicts
 
|name=Franco-Moroccan conflicts
 
|title=Franco-Moroccan conflicts
 
|title=Franco-Moroccan conflicts
|battles= '''Industrial era''':<br/>[[Larache expedition]]<br/>[[French conquest of Algeria|French conquest of Algeria (1830–1847)]] [[First Franco-Moroccan War]]<br/>[[Treaty of Tangiers|Treaty of Tangiers (1844)]]<br/>'''Modern era''':<br/>[[Second Franco-Moroccan War]]&nbsp;– [[Treaty of Fez]]<br/>[[French protectorate of Morocco|French Morocco (1912–1956)]]&nbsp;– [[Zaian War|Zaian War (1914–1921)]]<br/>[[Rif War (1920)]]&nbsp;– [[Ifni War|Ifni War (1957–1958)]]
+
|battles= '''Medieval era''':<br/> [[First Crusade]]&nbsp;– [[Second Crusade]]<br/>'''Industrial era''':<br/>[[Larache expedition]]<br/>[[French conquest of Algeria|French conquest of Algeria (1830–1847)]] [[First Franco-Moroccan War]]<br/>[[Treaty of Tangiers|Treaty of Tangiers (1844)]]<br/>'''Modern era''':<br/>[[Second Franco-Moroccan War]]&nbsp;– [[Treaty of Fez]]<br/>[[French protectorate of Morocco|French Morocco (1912–1956)]]&nbsp;– [[Zaian War|Zaian War (1914–1921)]]<br/>[[Rif War (1920)]]&nbsp;– [[Ifni War|Ifni War (1957–1958)]]
 
}}<noinclude>
 
}}<noinclude>
 
[[Category:Morocco history templates]]
 
[[Category:Morocco history templates]]
 
</noinclude>
 
</noinclude>

Revision as of 16:47, 19 June 2012