Mike Jolley de6d1d23be Merge branch 'fix-12922' ... # Conflicts: # assets/js/frontend/single-product.js		2017-01-26 14:59:30 +00:00
..
languages	Merge branch 'fix-12922'	2017-01-26 14:59:30 +00:00
states	Update IN.php	2016-12-09 01:55:24 +05:30
continents.php	Fixed coding standards	2016-11-17 18:07:58 -02:00
countries.php	Removed duplicated Saint Martin	2016-06-30 04:40:33 -03:00
locale-info.php	Merge branch 'fix-12922'	2017-01-26 14:57:51 +00:00