Mike Jolley 117990d95f Merge branch 'pr/11219' ... # Conflicts: # assets/js/frontend/cart.min.js		2016-06-24 12:39:47 +01:00
..
languages	Merge branch 'pr/11219'	2016-06-24 12:39:47 +01:00
states	Justins feedback/code tidy	2016-02-10 13:21:16 +00:00
continents.php	Add curacao to south america	2016-06-23 11:34:50 +01:00
countries.php	Removed non-existent country (Netherlands Antilles) from https://en.wikipedia.org/wiki/ISO_3166-1.	2016-06-22 11:35:21 +01:00
locale-info.php	Update locale-info.php	2016-05-02 14:50:55 -04:00