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

From blackwiki
Jump to navigation Jump to search
imported>DadaNeem
(Franco-Moroccan conflicts -approximately right)
imported>HCPUNXKID
(Deleted non armed conflict included with no reason)
Line 3: Line 3:
 
|title=[[Morocco–France relations|Franco-Moroccan conflicts]]
 
|title=[[Morocco–France relations|Franco-Moroccan conflicts]]
 
|battles=
 
|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)]]
+
'''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/>[[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 14:28, 15 February 2013