Mike Jolley d756b9c7ba Merge branch 'pr/11337' ... # Conflicts: # assets/css/admin.css		2016-08-02 14:44:00 +01:00
..
languages	Merge branch 'pr/11337'	2016-08-02 14:44:00 +01:00
states	Fixed coding standards and file version for i18n/states/NG.php	2016-07-20 17:07:21 -03:00
continents.php	Added missing Sint Maarten country and fixes the continents	2016-06-29 18:26:06 -03:00
countries.php	Removed duplicated Saint Martin	2016-06-30 04:40:33 -03:00
locale-info.php	Update locale-info.php	2016-05-02 14:50:55 -04:00