Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 24 insertions, 24 deletions

diff --git a/vendor/commerceguys/intl/resources/country/fil.json b/vendor/commerceguys/intl/resources/country/fil.json
index f14ba9fb0..a0036baed 100644
--- a/vendor/commerceguys/intl/resources/country/fil.json
+++ b/vendor/commerceguys/intl/resources/country/fil.json
@@ -24,7 +24,7 @@
 		"name": "Antarctica"
 	},
 	"AG": {
-		"name": "Antigua and Barbuda"
+		"name": "Antigua & Barbuda"
 	},
 	"AO": {
 		"name": "Angola"
@@ -135,7 +135,7 @@
 		"name": "Central African Republic"
 	},
 	"EA": {
-		"name": "Ceuta and Melilla"
+		"name": "Ceuta & Melilla"
 	},
 	"TD": {
 		"name": "Chad"
@@ -186,7 +186,7 @@
 		"name": "Cyprus"
 	},
 	"CZ": {
-		"name": "Czech Republic"
+		"name": "Czechia"
 	},
 	"DK": {
 		"name": "Denmark"
@@ -563,27 +563,12 @@
 	"RW": {
 		"name": "Rwanda"
 	},
-	"BL": {
-		"name": "Saint Barthélemy"
-	},
-	"SH": {
-		"name": "Saint Helena"
-	},
-	"KN": {
-		"name": "Saint Kitts and Nevis"
-	},
 	"LC": {
 		"name": "Saint Lucia"
 	},
 	"MF": {
 		"name": "Saint Martin"
 	},
-	"PM": {
-		"name": "Saint Pierre and Miquelon"
-	},
-	"VC": {
-		"name": "Saint Vincent and the Grenadines"
-	},
 	"WS": {
 		"name": "Samoa"
 	},
@@ -591,7 +576,7 @@
 		"name": "San Marino"
 	},
 	"ST": {
-		"name": "São Tomé and Príncipe"
+		"name": "São Tomé & Príncipe"
 	},
 	"SA": {
 		"name": "Saudi Arabia"
@@ -630,7 +615,7 @@
 		"name": "South Africa"
 	},
 	"GS": {
-		"name": "South Georgia and the South Sandwich Islands"
+		"name": "South Georgia & South Sandwich Islands"
 	},
 	"ES": {
 		"name": "Spain"
@@ -638,6 +623,21 @@
 	"LK": {
 		"name": "Sri Lanka"
 	},
+	"BL": {
+		"name": "St. Barthélemy"
+	},
+	"SH": {
+		"name": "St. Helena"
+	},
+	"KN": {
+		"name": "St. Kitts & Nevis"
+	},
+	"PM": {
+		"name": "St. Pierre & Miquelon"
+	},
+	"VC": {
+		"name": "St. Vincent & Grenadines"
+	},
 	"SD": {
 		"name": "Sudan"
 	},
@@ -645,7 +645,7 @@
 		"name": "Suriname"
 	},
 	"SJ": {
-		"name": "Svalbard and Jan Mayen"
+		"name": "Svalbard & Jan Mayen"
 	},
 	"SZ": {
 		"name": "Swaziland"
@@ -690,7 +690,7 @@
 		"name": "Tonga"
 	},
 	"TT": {
-		"name": "Trinidad and Tobago"
+		"name": "Trinidad & Tobago"
 	},
 	"TA": {
 		"name": "Tristan de Cunha"
@@ -705,7 +705,7 @@
 		"name": "Turkmenistan"
 	},
 	"TC": {
-		"name": "Turks and Caicos Islands"
+		"name": "Turks & Caicos Islands"
 	},
 	"TV": {
 		"name": "Tuvalu"
@@ -747,7 +747,7 @@
 		"name": "Vietnam"
 	},
 	"WF": {
-		"name": "Wallis and Futuna"
+		"name": "Wallis & Futuna"
 	},
 	"YE": {
 		"name": "Yemen"