Difference between revisions of "Template:Campaignbox Franco-Moroccan conflicts"
Jump to navigation
Jump to search
imported>Dumelow (link to Zaian war) |
imported>Dumelow m (correct date) |
||
| Line 2: | Line 2: | ||
|name=Franco-Moroccan conflicts | |name=Franco-Moroccan conflicts | ||
|title=Franco-Moroccan conflicts | |title=Franco-Moroccan conflicts | ||
| − | |battles= '''Medieval era''':<br/> [[First Crusade]] – [[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]] – [[Treaty of Fez]]<br/>[[French protectorate of Morocco|French Morocco (1912-1956)]] – [[Zaian War|Zaian War ( | + | |battles= '''Medieval era''':<br/> [[First Crusade]] – [[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]] – [[Treaty of Fez]]<br/>[[French protectorate of Morocco|French Morocco (1912-1956)]] – [[Zaian War|Zaian War (1914-1921)]]<br/>[[Rif War (1920)]] – [[Ifni War|Ifni War (1957–1958)]] |
}}<noinclude> | }}<noinclude> | ||
[[Category:Morocco history templates]] | [[Category:Morocco history templates]] | ||
</noinclude> | </noinclude> | ||