Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop

# Conflicts: # .DS_Store # Ifish/Info.plist
2019-05-27 16:43:44 +08:00
parent 8e027e82c9 a3adda793e
commit 40815eb7d5
2 changed files with 2 additions and 0 deletions
@@ -12898,6 +12898,7 @@
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				"zh-Hans",